Fix docs and templates to account for deprecation of get_options.

2 files changed, 3 insertions, 6 deletions

diff --git a/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl b/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl
index 0f714f7c7..11a137fc2 100644
--- a/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl
+++ b/repoze/bfg/paster_templates/starter/+package+/run.py_tmpl
@@ -1,5 +1,4 @@
 from repoze.bfg.router import make_app
-from repoze.bfg.registry import get_options
 
 def app(global_config, **kw):
     """ This function returns a repoze.bfg.router.Router object.  It
@@ -8,6 +7,5 @@ def app(global_config, **kw):
     # paster app config callback
     from {{package}}.models import get_root
     import {{package}}
-    options = get_options(kw)
-    return make_app(get_root, {{package}}, options=options)
+    return make_app(get_root, {{package}}, options=kw)
 
diff --git a/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl b/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl
index 39a9e76b1..4d3b98882 100644
--- a/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl
+++ b/repoze/bfg/paster_templates/zodb/+package+/run.py_tmpl
@@ -1,5 +1,4 @@
-from repoze.bfg.router import make_app as bfg_make_app
-from repoze.bfg.registry import get_options
+from repoze.bfg.router import make_app
 from repoze.zodbconn.finder import PersistentApplicationFinder
 
 def app(global_config, **kw):
@@ -15,4 +14,4 @@ def app(global_config, **kw):
         raise ValueError("No 'zodb_uri' in application configuration.")
 
     get_root = PersistentApplicationFinder(zodb_uri, appmaker)
-    return bfg_make_app(get_root, {{package}}, options=get_options(kw))
+    return make_app(get_root, {{package}}, options=kw)