diff options
| -rw-r--r-- | CHANGES.txt | 13 | ||||
| -rw-r--r-- | pyramid/scaffolds/__init__.py | 4 | ||||
| -rw-r--r-- | pyramid/scaffolds/alchemy/+package+/scripts/populate.py_tmpl (renamed from pyramid/scaffolds/alchemy/+package+/scripts/populate.py) | 2 | ||||
| -rw-r--r-- | pyramid/scaffolds/alchemy/+package+/tests.py_tmpl | 4 | ||||
| -rw-r--r-- | pyramid/scaffolds/alchemy/+package+/views.py_tmpl | 4 |
5 files changed, 19 insertions, 8 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 33008cbea..183c7406b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -14,6 +14,9 @@ Features spec. An entire application can be written with such asset specs, requiring no ordered lookup path. +- ``bpython`` interpreter compatibility in ``pshell``. See the "Command-Line + Pyramid" narrative docs chapter for more information. + Bug Fixes --------- @@ -57,6 +60,11 @@ Backwards Incompatibilities ``paste.httpserver`` server. Rationale: Rationale: the Paste and PasteScript packages do not run under Python 3. +- The ``pshell`` command (nee "paster pshell") no longer accepts a + ``--disable-ipython`` command-line argument. Instead, it accepts a ``-p`` + or ``--python-shell`` argument, which can be any of the values ``python``, + ``ipython`` or ``bpython``. + Dependencies ------------ @@ -77,7 +85,6 @@ Scaffolds - Rendered scaffolds have now been changed to be more relocatable (fewer mentions of the package name within files in the package). -- The ``alchemy`` scaffold has been removed. - -- The ``routesalchemy`` scaffold has been renamed ``alchemy``. +- The ``routesalchemy`` scaffold has been renamed ``alchemy``, replacing the + older (traversal-based) ``alchemy`` scaffold (which has been retired). 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_tmpl index 5d367c987..7af326be9 100644 --- a/pyramid/scaffolds/alchemy/+package+/scripts/populate.py +++ b/pyramid/scaffolds/alchemy/+package+/scripts/populate.py_tmpl @@ -23,5 +23,5 @@ def main(argv=sys.argv): 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=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}}'} |