From 7d2f14f32942c5a2cc7a30d80e3cbd4716c1ce5c Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 12 Nov 2011 19:45:07 -0500
Subject: Fix ZODB scaffolding to match ZODB tutorial docs (Ken made
 relocatable).

---
 TODO.txt                                                  |  6 +++---
 pyramid/scaffolds/zodb/+package+/__init__.py              | 15 +++++++++++++++
 pyramid/scaffolds/zodb/+package+/__init__.py_tmpl         | 15 ---------------
 .../scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl |  8 ++++----
 pyramid/scaffolds/zodb/+package+/tests.py_tmpl            |  2 +-
 pyramid/scaffolds/zodb/+package+/views.py_tmpl            |  4 ++--
 6 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 pyramid/scaffolds/zodb/+package+/__init__.py
 delete mode 100644 pyramid/scaffolds/zodb/+package+/__init__.py_tmpl

diff --git a/TODO.txt b/TODO.txt
index e3419ad28..d3b527f43 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,12 +4,12 @@ Pyramid TODOs
 Must-Have
 ---------
 
-- Fix ZODB scaffolding to match ZODB tutorial docs (Ken made relocatable).
-
 - Fix ZODB tutorial docs to match ZODB tutorial code (I removed program name
   from ``scan``).
 
-- Fix SQLA tutorial (and scaffolding) to match ZODB tutorial.
+- Fix SQLA tutorial to match ZODB tutorial.
+
+- Fix other scaffolds to match ZODB scaffold.
 
 Nice-to-Have
 ------------
diff --git a/pyramid/scaffolds/zodb/+package+/__init__.py b/pyramid/scaffolds/zodb/+package+/__init__.py
new file mode 100644
index 000000000..b63933fc5
--- /dev/null
+++ b/pyramid/scaffolds/zodb/+package+/__init__.py
@@ -0,0 +1,15 @@
+from pyramid.config import Configurator
+from pyramid_zodbconn import get_connection
+from .models import appmaker
+
+def root_factory(request):
+    conn = get_connection(request)
+    return appmaker(conn.root())
+
+def main(global_config, **settings):
+    """ This function returns a Pyramid WSGI application.
+    """
+    config = Configurator(root_factory=root_factory, settings=settings)
+    config.add_static_view('static', 'static', cache_max_age=3600)
+    config.scan()
+    return config.make_wsgi_app()
diff --git a/pyramid/scaffolds/zodb/+package+/__init__.py_tmpl b/pyramid/scaffolds/zodb/+package+/__init__.py_tmpl
deleted file mode 100644
index 935121888..000000000
--- a/pyramid/scaffolds/zodb/+package+/__init__.py_tmpl
+++ /dev/null
@@ -1,15 +0,0 @@
-from pyramid.config import Configurator
-from pyramid_zodbconn import get_connection
-from {{package}}.models import appmaker
-
-def root_factory(request):
-    conn = get_connection(request)
-    return appmaker(conn.root())
-
-def main(global_config, **settings):
-    """ This function returns a Pyramid WSGI application.
-    """
-    config = Configurator(root_factory=root_factory, settings=settings)
-    config.add_static_view('static', '{{package}}:static', cache_max_age=3600)
-    config.scan('{{package}}')
-    return config.make_wsgi_app()
diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
index 3cd9c66a4..ab698123e 100644
--- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
@@ -5,19 +5,19 @@
   <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
   <meta name="keywords" content="python web application" />
   <meta name="description" content="pyramid web application" />
-  <link rel="shortcut icon" href="${request.static_url('{{package}}:static/favicon.ico')}" />
-  <link rel="stylesheet" href="${request.static_url('{{package}}:static/pylons.css')}" type="text/css" media="screen" charset="utf-8" />
+  <link rel="shortcut icon" href="/static/favicon.ico" />
+  <link rel="stylesheet" href="/static/pylons.css" type="text/css" media="screen" charset="utf-8" />
   <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/nobile/stylesheet.css" media="screen" />
   <link rel="stylesheet" href="http://static.pylonsproject.org/fonts/neuton/stylesheet.css" media="screen" />
   <!--[if lte IE 6]>
-  <link rel="stylesheet" href="${request.static_url('{{package}}:static/ie6.css')}" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="/static/ie6.css" type="text/css" media="screen" charset="utf-8" />
   <![endif]-->
 </head>
 <body>
   <div id="wrap">
     <div id="top">
       <div class="top align-center">
-        <div><img src="${request.static_url('{{package}}:static/pyramid.png')}" width="750" height="169" alt="pyramid"/></div>
+        <div><img src="/static/pyramid.png" width="750" height="169" alt="pyramid"/></div>
       </div>
     </div>
     <div id="middle">
diff --git a/pyramid/scaffolds/zodb/+package+/tests.py_tmpl b/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
index 1627bf015..401260efb 100644
--- a/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/tests.py_tmpl
@@ -10,7 +10,7 @@ class ViewTests(unittest.TestCase):
         testing.tearDown()
 
     def test_my_view(self):
-        from {{package}}.views import my_view
+        from .views import my_view
         request = testing.DummyRequest()
         info = my_view(request)
         self.assertEqual(info['project'], '{{project}}')
diff --git a/pyramid/scaffolds/zodb/+package+/views.py_tmpl b/pyramid/scaffolds/zodb/+package+/views.py_tmpl
index d4a1147c6..083798095 100644
--- a/pyramid/scaffolds/zodb/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/views.py_tmpl
@@ -1,6 +1,6 @@
 from pyramid.view import view_config
-from {{package}}.models import MyModel
+from .models import MyModel
 
-@view_config(context=MyModel, renderer='{{package}}:templates/mytemplate.pt')
+@view_config(context=MyModel, renderer='templates/mytemplate.pt')
 def my_view(request):
     return {'project':'{{project}}'}
-- 
cgit v1.2.3