Templates

---------

- Remove ``ez_setup.py`` and its import from all paster templates,
  samples, and tutorials for ``distribute`` compatibility.  The
  documentation already explains how to install virtualenv (which will
  include some ``setuptools`` package), so these files, imports and
  usages were superfluous.

Deprecations
------------

- The ``options`` kw arg to the ``repoze.bfg.router.make_app``
  function is deprecated.  In its place is the keyword argument
  ``settings``.  The ``options`` keyword continues to work, and a
  deprecation warning is not emitted when it is detected.  However,
  the paster templates, code samples, and documentation now make
  reference to ``settings`` rather than ``options``.  This
  change/deprecation was mainly made for purposes of clarity and
  symmetry with the ``get_settings()`` API and dicussions of
  "settings" in various places in the docs: we want to use the same
  name to refer to the same thing everywhere.

1 files changed, 33 insertions, 6 deletions

diff --git a/repoze/bfg/tests/test_router.py b/repoze/bfg/tests/test_router.py
index d5bc8cd66..07c10adaa 100644
--- a/repoze/bfg/tests/test_router.py
+++ b/repoze/bfg/tests/test_router.py
@@ -432,27 +432,54 @@ class TestMakeApp(unittest.TestCase):
         from repoze.bfg.router import make_app
         return make_app(None, *arg, **kw)
 
-    def test_it(self):
-        from repoze.bfg.interfaces import IWSGIApplicationCreatedEvent
-        from zope.component import getSiteManager
-        from repoze.bfg.tests import fixtureapp
-        sm = getSiteManager()
+    def _get_make_registry(self, sm):
         class DummyMakeRegistry(object):
             def __call__(self, *arg):
                 self.arg = arg
                 return sm
+        return DummyMakeRegistry()
+
+    def test_it(self):
+        from repoze.bfg.interfaces import IWSGIApplicationCreatedEvent
+        from repoze.bfg.tests import fixtureapp
+        from zope.component import getSiteManager
+        sm = getSiteManager()
+        dummy_make_registry = self._get_make_registry(sm)
         def subscriber(event):
             event.app.created = True        
-        dummy_make_registry = DummyMakeRegistry()
         manager = DummyRegistryManager()
         sm.registerHandler(subscriber, (IWSGIApplicationCreatedEvent,))
         rootfactory = DummyRootFactory(None)
+        settings = {'a':1}
         app = self._callFUT(rootfactory, fixtureapp, manager=manager,
+                            settings=settings,
+                            make_registry=dummy_make_registry)
+        self.failUnless(app.created)
+        self.failUnless(manager.pushed)
+        self.failUnless(manager.popped)
+        self.assertEqual(len(dummy_make_registry.arg), 6)
+        self.assertEqual(dummy_make_registry.arg[-1], settings)
+
+    def test_it_options_means_settings(self):
+        from repoze.bfg.interfaces import IWSGIApplicationCreatedEvent
+        from zope.component import getSiteManager
+        from repoze.bfg.tests import fixtureapp
+        sm = getSiteManager()
+        dummy_make_registry = self._get_make_registry(sm)
+        def subscriber(event):
+            event.app.created = True        
+        manager = DummyRegistryManager()
+        sm.registerHandler(subscriber, (IWSGIApplicationCreatedEvent,))
+        rootfactory = DummyRootFactory(None)
+        settings = {'a':1}
+        app = self._callFUT(rootfactory, fixtureapp, options=settings,
+                            manager=manager,
                             make_registry=dummy_make_registry)
         self.failUnless(app.created)
         self.failUnless(manager.pushed)
         self.failUnless(manager.popped)
         self.assertEqual(len(dummy_make_registry.arg), 6)
+        self.assertEqual(dummy_make_registry.arg[-1], settings)
 
 class DummyContext:
     pass