Changeset 140:db13c054475d

Timestamp:

08/13/08 17:53:50 (4 months ago)

Author:

shadytrees

branch:

default

Message:

Setuptools plus a normal directory layout. (ticket:10)

Files:

• .hgignore (modified) (1 diff)
• LICENSE (added)
• MANIFEST.in (added)
• ovenfreak/feudalism.py (modified) (1 diff)
• ovenfreak/handlers.py (modified) (4 diffs)
• ovenfreak/intercept.fcgi (deleted)
• ovenfreak/intercept.mod_wsgi (deleted)
• ovenfreak/logics/main.py (modified) (1 diff)
• ovenfreak/page.py (modified) (3 diffs)
• ovenfreak/plugins/nemo/admin.py (modified) (1 diff)
• ovenfreak/plugins/nemo/faults.py (modified) (1 diff)
• ovenfreak/plugins/nemo/sword.py (modified) (1 diff)
• ovenfreak/plugins/nemo/user.py (modified) (1 diff)
• ovenfreak/plugins/nemo/user_edit.py (modified) (1 diff)
• ovenfreak/plugins/nemo/user_view.py (modified) (1 diff)
• ovenfreak/session.py (modified) (1 diff)
• ovenfreak/template.py (modified) (1 diff)
• ovenfreak/water.py (modified) (1 diff)
• setup.py (added)

.hgignore

@@ -3 +3 @@
-art/
-sessions/
+Ovenfreak.egg-info/
+dist/
+build/

ovenfreak/feudalism.py

@@ -1 @@
-
+
+
-import time
-

ovenfreak/handlers.py

@@ -2 +2 @@
-from cgi import escape, parse_qs, FieldStorage
-from Cookie import SimpleCookie, Morsel
+import ovenfreak
+from ovenfreak import errors
-
-base = os.path.dirname(__file__)
-
-
-
+
-
-from ovenfreak import errors
-error_page = None
-try:
-    from ovenfreak import nervous
-except errors.NoConfigError:
-    error_page = errors.NoConfigPage()
-except Exception, e:
-    error_page = errors.ExceptionPage(sys.exc_info())
-
-class Request(object): pass
@@ -40 +33 @@
-
-def mod_python(req):
+    from ovenfreak import nervous
-    req.content_type = 'text/html; charset=utf-8'
-    os.environ.update(req.subprocess_env)
@@ -93 +87 @@
-@Rye
-def wsgi(e, r):
+    from ovenfreak import nervous
-    file = e['PATH_INFO'][1:] or 'HomePage'
-    sun = error_page or nervous.get_logic(file)
@@ -123 +118 @@
-        if type(body) == str: return [body]
-        else: return [body.encode('utf-8')]
+
+def _get(aconfig):
+    ## TODO: Throw an error page if there's a bad config.
+    storage = type('Storage', (), {})
+    for key in aconfig:
+        setattr(storage, key, aconfig[key])
+    ovenfreak.config = storage
+
+    try:
+        from ovenfreak import nervous
+    except Exception, e:
+        error_page = errors.ExceptionPage(sys.exc_info())
+
+    server = aconfig['server']
+    if server == 'mod_wsgi':
+        # mod_wsgi wants a WSGI application() function.
+        return wsgi
+    elif server == 'fastcgi':
+        # fcgi wants us to call its own WSGIServer.
+        from fcgi import WSGIServer
+        WSGIServer(wsgi).run()
+        return None
+    elif server == 'mod_python':
+        return mod_python
+
+def get(*a, **k):
+    try:
+        return _get(*a, **k)
+    except Exception, e:
+       error_page = errors.ExceptionPage(sys.exc_info())

ovenfreak/logics/main.py

@@ -1 @@
-, config
+
-from ovenfreak.feudalism import Administrator
+from ovenfreak.water import config
-
-not_exist = """

ovenfreak/page.py

@@ -3 +3 @@
-from simple_hg import Hg
-
-base = os.path.dirname(__file__)
-class BasePage(object):
-    """
@@ -10 +9 @@
-    """
-    def __init__(self, path):
-base
+config.abspath
-
-    def read(self):
@@ -47 +46 @@
-        BasePage.__init__(self, path)
-        self.file = path
-base
+config.abspath
-
-    def write(self, body, user):

ovenfreak/plugins/nemo/admin.py

@@ -1 @@
-
+
+
-from ovenfreak.logics.main import MainPage
-from ovenfreak.feudalism import Administrator
-from ovenfreak import errors
-import nonce
-
-class Admin(MainPage):

ovenfreak/plugins/nemo/faults.py

@@ -4 +4 @@
-"""
-
-
-
+
+
+
+
-iago = 'one_names[]', 'two_names[]', 'three_names[]'
-cassio = 'one_grades[]', 'two_grades[]', 'three_grades[]'

ovenfreak/plugins/nemo/sword.py

@@ -1 @@
-from water import *
-from user import is_user_valid
-, session
+
-import os.path as pather
+from ovenfreak import session
-from ovenfreak.logics.main import MainPage
+from ovenfreak.water import *
-
-header = """From: %s

ovenfreak/plugins/nemo/user.py

@@ -1 @@
-
+ovenfreak.
-from ovenfreak.feudalism import Serf
-

ovenfreak/plugins/nemo/user_edit.py

@@ -1 @@
-from water import *
-from user import *
-from user_view import get_email
-
-from ovenfreak import page, session
-from ovenfreak.logics import main
-from nemo import faults, register, fudge
+from user_view import get_email
-
-masquerade_note = '<input type="hidden" name="is_masquerade" value="~"></form>'

ovenfreak/plugins/nemo/user_view.py

@@ -1 @@
-from water import *
-from ovenfreak.logics.main import MainPage
-from ovenfreak import errors
-from ovenfreak.feudalism import Administrator
+from ovenfreak.water import *
+from ovenfreak.logics.main import MainPage
-from nemo.user import *
-import cgi

ovenfreak/session.py

@@ -2 +2 @@
-import os.path, os
-
-water.config.chdire + 'sessions/'
+os.path.join(water.config.abspath + 'sessions/')
-if not os.path.exists(session_dir): os.makedirs(session_dir)
-

ovenfreak/template.py

@@ -1 @@
-config, 
+
-from jinja2 import Environment, FileSystemLoader
-from markdown2 import markdown
-from smartypants import smartyPants
+from ovenfreak import config
-
-chdire
+abspath, 'ovenfreak'
-env = Environment(loader = FileSystemLoader(folder),
-                  autoescape = True,

ovenfreak/water.py

@@ -1 +1 @@
-import MySQLdb as dbapi
-
+
+
-
-
-
-
-
-
-
-
-
+
-    return open(os.path.join(prefix, file)).read()
-