Commits

agentultra committed 4dd891d Merge

Merging from upstream

Comments (0)

Files changed (6)

 .coverage
 *.pyc
 *.egg-info
+*.egg
 ez_setup
 pylons/docs/*/_build
 container_file
 
 1.1 (**tip**)
 * Remove Pylons nose plugin. Increase globals that default tests setup.
-* Added event system for extensions/plugins to hook in with.
-* Add venusian for use with events.
-* Require Marco for event system.
 
 1.0.1 (**tip**)
 * Utilize MarkupSafe for faster HTML escaping.

pylons/templates/minimal_project/+package+/routing.py_tmpl

 may take precedent over the more generic routes. For more information
 refer to the routes manual at http://routes.groovie.org/docs/
 """
-from pylons import config
 from routes import Mapper
 
-def make_map():
+def make_map(config):
     """Create, configure and return the routes Mapper"""
     map = Mapper(directory=config['pylons.paths']['controllers'],
                  always_scan=config['debug'])
     map.minimization = False
+    map.explicit = False
+
+    # The ErrorController route (handles 404/500 error pages); it should
+    # likely stay at the top, ensuring it can always be resolved
+    map.connect('/error/{action}', controller='error')
+    map.connect('/error/{action}/{id}', controller='error')
 
     # CUSTOM ROUTES HERE
 
     map.connect('/{controller}/{action}')
     map.connect('/{controller}/{action}/{id}')
+
     return map

pylons/templates/minimal_project/+package+/wsgiapp.py_tmpl

                  templates=[os.path.join(root, 'templates')])
 
     # Initialize config with the basic options
-    config.init_app(global_conf, app_conf, package='{{package}}',
-                    template_engine='{{template_engine}}', paths=paths)
+    config.init_app(global_conf, app_conf, package='{{package}}', paths=paths)
 
     config['routes.map'] = make_map(config)
     config['pylons.app_globals'] = Globals(config)
 # constrain nosetests to the tests dir for now: 0.10 ends up
 # overwriting pylons.config with the actual module
 where=tests
-verbose=True
-verbosity=1
-detailed-errors=True
-with-coverage=True
 cover-package=pylons
-cover-inclusive=True
 cover-erase=True
 with-doctest=True
         "Paste>=1.7.2", "PasteDeploy>=1.3.3", "PasteScript>=1.7.3",
         "FormEncode>=1.2.1", "simplejson>=2.0.8", "decorator>=2.3.2",
         "nose>=0.10.4", "Mako>=0.2.4", "WebOb>=0.9.6.1", "WebError>=0.10.1",
-        "WebTest>=1.1", "Tempita>=0.2", "MarkupSafe>=0.9.2", "Marco>=0.1a2",
-        "venusian>=0.2",
+        "WebTest>=1.1", "Tempita>=0.2", "MarkupSafe>=0.9.2",
     ],
     dependency_links=[
         "http://www.pylonshq.com/download/1.0"