Changeset 96

Timestamp:

2009年08月23日 15时40分34秒 (2 years ago)

Author:

jiangx

Message:

Fixed #28: downgrade pylons framework from 0.9.7 to 0.9.6.2

Location:

branches/0.2.1.x

Files:

• pySvnManager.egg-info/requires.txt (modified) (1 diff)
• pysvnmanager/config/environment.py (modified) (2 diffs)
• pysvnmanager/config/middleware.py (modified) (3 diffs)
• pysvnmanager/controllers/error.py (modified) (2 diffs)
• pysvnmanager/lib/app_globals.py (modified) (1 diff)
• pysvnmanager/lib/base.py (modified) (2 diffs)
• pysvnmanager/websetup.py (modified) (1 diff)
• setup.cfg (modified) (1 diff)
• setup.py (modified) (2 diffs)

branches/0.2.1.x/pySvnManager.egg-info/requires.txt

@@ -1 @@
-Pylons>=0.9.7rc1
+Pylons==0.9.6.2
 docutils
 Babel

branches/0.2.1.x/pysvnmanager/config/environment.py

@@ -1 +1 @@
 """Pylons environment configuration"""
-# -*- coding: utf-8 -*-
 import os
 
-from mako.lookup import TemplateLookup
 from pylons import config
 
@@ -22 +20 @@
 
     # Initialize config with the basic options
-    config.init_app(global_conf, app_conf, package='pysvnmanager', paths=paths)
+    config.init_app(global_conf, app_conf, package='pysvnmanager',
+                    template_engine='mako', paths=paths)
 
     config['routes.map'] = make_map()
-    config['pylons.app_globals'] = app_globals.Globals()
+    config['pylons.g'] = app_globals.Globals()
     config['pylons.h'] = pysvnmanager.lib.helpers
 
-    # Create the Mako TemplateLookup, with the default auto-escaping
-    config['pylons.app_globals'].mako_lookup = TemplateLookup(
-        directories=paths['templates'],
-        module_directory=os.path.join(app_conf['cache_dir'], 'templates'),
-        input_encoding='utf-8', output_encoding='utf-8',
-        imports=['from webhelpers.html import escape'],
-        )
-        #default_filters=['escape'])
-        
+    # Customize templating options via this variable
+    tmpl_options = config['buffet.template_options']
+
     # CONFIGURATION OPTIONS HERE (note: all config options will override
     # any Pylons config options)

branches/0.2.1.x/pysvnmanager/config/middleware.py

@@ -1 +1 @@
 """Pylons middleware initialization"""
-from beaker.middleware import CacheMiddleware, SessionMiddleware
 from paste.cascade import Cascade
 from paste.registry import RegistryManager
 from paste.urlparser import StaticURLParser
 from paste.deploy.converters import asbool
+
 from pylons import config
-from pylons.middleware import ErrorHandler, StatusCodeRedirect
+from pylons.error import error_template
+from pylons.middleware import error_mapper, ErrorDocuments, ErrorHandler, \
+    StaticJavascripts
 from pylons.wsgiapp import PylonsApp
-from routes.middleware import RoutesMiddleware
 
 from pysvnmanager.config.environment import load_environment
@@ -26 +27 @@
 
     ``app_conf``
-        The application's local configuration. Normally specified in
-        the [app:<name>] section of the Paste ini file (where <name>
+        The application's local configuration. Normally specified in the
+        [app:<name>] section of the Paste ini file (where <name>
         defaults to main).
-
     """
     # Configure the Pylons environment
@@ -36 +36 @@
     # The Pylons WSGI app
     app = PylonsApp()
-    
+
     # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares)
-    
-    # Routing/Session/Cache Middleware
-    app = RoutesMiddleware(app, config['routes.map'])
-    app = SessionMiddleware(app, config)
-    app = CacheMiddleware(app, config)
-    
+
     if asbool(full_stack):
         # Handle Python exceptions
-        app = ErrorHandler(app, global_conf, **config['pylons.errorware'])
+        app = ErrorHandler(app, global_conf, error_template=error_template,
+                           **config['pylons.errorware'])
 
         # Display error documents for 401, 403, 404 status codes (and
         # 500 when debug is disabled)
-        if asbool(config['debug']):
-            app = StatusCodeRedirect(app)
-        else:
-            app = StatusCodeRedirect(app, [400, 401, 403, 404, 500])
+        app = ErrorDocuments(app, global_conf, mapper=error_mapper, **app_conf)
 
     # Establish the Registry for this application
     app = RegistryManager(app)
 
-    # Static files (If running in production, and Apache or another web 
-    # server is handling this static content, remove the following 3 lines)
+    # Static files
+    javascripts_app = StaticJavascripts()
     static_app = StaticURLParser(config['pylons.paths']['static_files'])
-    app = Cascade([static_app, app])
+    app = Cascade([static_app, javascripts_app, app])
     return app

branches/0.2.1.x/pysvnmanager/controllers/error.py

@@ -21 +21 @@
 
 from paste.urlparser import StaticURLParser
-from pylons import request
-from pylons.controllers.util import forward
 from pylons.middleware import error_document_template, media_path
-from webhelpers.html.builder import literal
 
-from pysvnmanager.lib.base import BaseController
+from pysvnmanager.lib.base import *
 
 class ErrorController(BaseController):
@@ -40 +37 @@
     def document(self):
         """Render the error document"""
-        resp = request.environ.get('pylons.original_response')
-        content = literal(resp.body) or cgi.escape(request.GET.get('message'))
         page = error_document_template % \
             dict(prefix=request.environ.get('SCRIPT_NAME', ''),
-                 code=cgi.escape(request.GET.get('code', str(resp.status_int))),
-                 message=content)
+                 code=cgi.escape(request.params.get('code', '')),
+                 message=cgi.escape(request.params.get('message', '')))
         return page
 

branches/0.2.1.x/pysvnmanager/lib/app_globals.py

@@ -17 +17 @@
 
 """The application's Globals object"""
+from pylons import config
 
 class Globals(object):

branches/0.2.1.x/pysvnmanager/lib/base.py

@@ -18 +18 @@
 """The base Controller API
 
-Provides the BaseController class for subclassing.
+Provides the BaseController class for subclassing, and other objects
+utilized by Controllers.
 """
+from pylons import c, cache, config, g, request, response, session
 from pylons.controllers import WSGIController
-from pylons.templating import render_mako as render
-
-from pylons import c, cache, config, g, request, response, session
 from pylons.controllers.util import abort, etag_cache, redirect_to
 from pylons.decorators import jsonify, validate
 from pylons.i18n import _, ungettext, N_
+from pylons.templating import render
 from pylons.i18n import set_lang, add_fallback
 import pysvnmanager.lib.helpers as h
@@ -70 +70 @@
         # the request is routed to. This routing information is
         # available in environ['pylons.routes_dict']
-
         return WSGIController.__call__(self, environ, start_response)
 

branches/0.2.1.x/pysvnmanager/websetup.py

@@ -30 +30 @@
 log = logging.getLogger(__name__)
 
-def setup_app(command, conf, vars):
+def setup_config(command, filename, section, vars):
     """Place any commands to setup pysvnmanager here"""
+    conf = appconfig('config:' + filename)
     load_environment(conf.global_conf, conf.local_conf)
 

branches/0.2.1.x/setup.cfg

@@ -5 +5 @@
 [easy_install]
 find_links = http://www.pylonshq.com/download/
+
+[pudge]
+theme = pythonpaste.org
+
+# Add extra doc files here with spaces between them
+docs = docs/index.txt
+
+# Doc Settings
+doc_base = docs/
+dest = docs/html
+
+# Add extra modules here separated with commas
+modules = pysvnmanager
+title = Pysvnmanager
+organization = Pylons
+
+# Highlight code-block sections with Pygments
+highlighter = pygments
+
+# Optionally add extra links
+#organization_url = http://pylonshq.com/
+#trac_url = http://pylonshq.com/project
+settings = no_about=true
+
+# Optionally add extra settings
+#           link1=/community/ Community
+#           link2=/download/ Download
+
+[publish]
+doc-dir=docs/html
+make-dirs=1
 
 # Babel configuration

branches/0.2.1.x/setup.py

@@ -26 +26 @@
 setup(
     name='pySvnManager',
-    version="0.3.0",
+    version="0.2.2",
     description='SVN authz web management tools.',
     author='Jiang Xin',
@@ -32 +32 @@
     url='https://sourceforge.net/projects/pysvnmanager',
     install_requires=[
-            "Pylons>=0.9.7rc1",
+            "Pylons==0.9.6.2",
             "docutils",
             "Babel",
-            #"Mako>=0.2.2",
-            #"WebHelpers>=0.6.1",
-            #"Routes>=1.9.2",
+            "Mako>=0.2.2",
+            "WebHelpers>=0.6",
+            "Routes>=1.9.2",
             #"python-ldap",
     ],