use new pyramid.scaffold

pyramid_formalchemy/paster.py

@@ -1,5 +1,16 @@
-from tempita import paste_script_template_renderer
-from pyramid.paster import PyramidTemplate
+try: # pyramid 1.0.X
+    # "pyramid.paster.paste_script..." doesn't exist past 1.0.X
+    from pyramid.paster import paste_script_template_renderer
+    from pyramid.paster import PyramidTemplate
+except ImportError:
+    try:  # pyramid 1.1.X, 1.2.X
+        # trying to import "paste_script_template_renderer" fails on 1.3.X
+        from pyramid.scaffolds import paste_script_template_renderer
+        from pyramid.scaffolds import PyramidTemplate
+    except ImportError: # pyramid >=1.3a2
+        paste_script_template_renderer = None
+        from pyramid.scaffolds import PyramidTemplate
+
 
 class PyramidFormAlchemyTemplate(PyramidTemplate):
     _template_dir = ('pyramid_formalchemy', 'paster_templates/pyramid_fa')

setup.py

@@ -11,7 +11,7 @@ requires = ['pyramid>=1.1', 'WebError', 'FormAlchemy>=1.3.8', 'Babel']
 setup(name='pyramid_formalchemy',
       version='0.4.2dev',
       description='FormAlchemy plugins and helpers for Pyramid',
-      long_description=README + '\n\nCHANGES\n=======\n\n' +  CHANGES,
+      long_description=README + '\n\nCHANGES\n=======\n\n' + CHANGES,
       classifiers=[
         "Programming Language :: Python",
         "Framework :: Pylons",
@@ -23,16 +23,17 @@ setup(name='pyramid_formalchemy',
       url='http://docs.formalchemy.org/pyramid_formalchemy/',
       keywords='web pyramid pylons formalchemy',
       packages=find_packages(exclude=['pyramidapp']),
-      message_extractors = { 'pyramid_formalchemy': [
-             ('*.py',   'lingua_python', None ),
-             ('templates/**.pt',   'lingua_xml', None ),
+      message_extractors={'pyramid_formalchemy': [
+             ('*.py', 'lingua_python', None),
+             ('templates/**.pt', 'lingua_xml', None),
              ]},
       include_package_data=True,
       zip_safe=False,
       install_requires=requires,
-      entry_points = """
+      entry_points="""
         [paste.paster_create_template]
         pyramid_fa = pyramid_formalchemy.paster:PyramidFormAlchemyTemplate
+        [pyramid.scaffold]
+        pyramid_fa = pyramid_formalchemy.paster:PyramidFormAlchemyTemplate
         """
       )
-