From 25b8a96b7825d0c3218bc1e3f90eaebd9b024371 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Mon, 21 Nov 2011 20:06:14 -0500
Subject: use reprs for py3 compat (py3 has no unicode literal syntax using u)

---
 pyramid/scaffolds/__init__.py                      |  4 ++++
 .../alchemy/+package+/scripts/populate.py          | 27 ----------------------
 .../alchemy/+package+/scripts/populate.py_tmpl     | 27 ++++++++++++++++++++++
 pyramid/scaffolds/alchemy/+package+/tests.py_tmpl  |  4 ++--
 pyramid/scaffolds/alchemy/+package+/views.py_tmpl  |  4 ++--
 5 files changed, 35 insertions(+), 31 deletions(-)
 delete mode 100644 pyramid/scaffolds/alchemy/+package+/scripts/populate.py
 create mode 100644 pyramid/scaffolds/alchemy/+package+/scripts/populate.py_tmpl

diff --git a/pyramid/scaffolds/__init__.py b/pyramid/scaffolds/__init__.py
index 3fba05390..20840a5d4 100644
--- a/pyramid/scaffolds/__init__.py
+++ b/pyramid/scaffolds/__init__.py
@@ -2,12 +2,16 @@ import binascii
 import os
 
 from pyramid.compat import native_
+from pyramid.compat import text_
 
 from pyramid.scaffolds.template import Template
 
 class PyramidTemplate(Template):
     def pre(self, command, output_dir, vars):
         vars['random_string'] = native_(binascii.hexlify(os.urandom(20)))
+        # placeholder text values
+        vars['one'] = text_('one')
+        vars['two'] = text_('two')
         package_logger = vars['package']
         if package_logger == 'root':
             # Rename the app logger in the rare case a project is named 'root'
diff --git a/pyramid/scaffolds/alchemy/+package+/scripts/populate.py b/pyramid/scaffolds/alchemy/+package+/scripts/populate.py
deleted file mode 100644
index 5d367c987..000000000
--- a/pyramid/scaffolds/alchemy/+package+/scripts/populate.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import os
-import sys
-
-from paste.deploy.loadwsgi import appconfig
-from sqlalchemy import engine_from_config
-import transaction
-
-from ..models import DBSession
-from ..models import MyModel
-from ..models import Base
-
-def usage(argv):
-    print('usage: %s <Pyramid ini filename>' % os.path.basename(argv[0]))
-    sys.exit(1)
-
-def main(argv=sys.argv):
-    try:
-        config_filename = argv[1]
-    except IndexError:
-        usage(argv)
-    settings = appconfig('config:' + os.path.abspath(config_filename))
-    engine = engine_from_config(settings, 'sqlalchemy.')
-    DBSession.configure(bind=engine)
-    Base.metadata.create_all(engine)
-    with transaction.manager:
-        model = MyModel(name=u'first', value=55)
-        DBSession.add(model)
diff --git a/pyramid/scaffolds/alchemy/+package+/scripts/populate.py_tmpl b/pyramid/scaffolds/alchemy/+package+/scripts/populate.py_tmpl
new file mode 100644
index 000000000..7af326be9
--- /dev/null
+++ b/pyramid/scaffolds/alchemy/+package+/scripts/populate.py_tmpl
@@ -0,0 +1,27 @@
+import os
+import sys
+
+from paste.deploy.loadwsgi import appconfig
+from sqlalchemy import engine_from_config
+import transaction
+
+from ..models import DBSession
+from ..models import MyModel
+from ..models import Base
+
+def usage(argv):
+    print('usage: %s <Pyramid ini filename>' % os.path.basename(argv[0]))
+    sys.exit(1)
+
+def main(argv=sys.argv):
+    try:
+        config_filename = argv[1]
+    except IndexError:
+        usage(argv)
+    settings = appconfig('config:' + os.path.abspath(config_filename))
+    engine = engine_from_config(settings, 'sqlalchemy.')
+    DBSession.configure(bind=engine)
+    Base.metadata.create_all(engine)
+    with transaction.manager:
+        model = MyModel(name={{repr(one)}}, value=1)
+        DBSession.add(model)
diff --git a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
index 229caa8d8..3b4b028a9 100644
--- a/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/tests.py_tmpl
@@ -17,7 +17,7 @@ class TestMyView(unittest.TestCase):
         DBSession.configure(bind=engine)
         Base.metadata.create_all(engine)
         with transaction.manager:
-            model = MyModel(name=u'first', value=55)
+            model = MyModel(name={{repr(one)}}, value=55)
             DBSession.add(model)
 
     def tearDown(self):
@@ -28,5 +28,5 @@ class TestMyView(unittest.TestCase):
         from .views import my_view
         request = testing.DummyRequest()
         info = my_view(request)
-        self.assertEqual(info['first'].name, 'first')
+        self.assertEqual(info['one'].name, 'one')
         self.assertEqual(info['project'], '{{project}}')
diff --git a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
index 69dbfd9ba..568b73c18 100644
--- a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl
@@ -5,5 +5,5 @@ from .models import MyModel
 
 @view_config(route_name='home', renderer='templates/mytemplate.pt')
 def my_view(request):
-    first = DBSession.query(MyModel).filter(MyModel.name==u'first').first()
-    return {'first':first, 'project':'{{project}}'}
+    one = DBSession.query(MyModel).filter(MyModel.name=={{repr(one)}}).first()
+    return {'one':one, 'project':'{{project}}'}
-- 
cgit v1.2.3