Prevent import warning when installed on Pyramid 1.2.

Pylons · Dec 15, 2011 · 29fe627 · 29fe627
1 parent fa3649c
commit 29fe627
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,8 @@
+Next release
+============
+
+- Prevent import warning when installed on Pyramid 1.2.
+
 0.2 (2011-12-14)
 ================
 

diff --git a/pyramid_jqm/scaffolds/__init__.py b/pyramid_jqm/scaffolds/__init__.py
@@ -1,9 +1,7 @@
-# package
-
 try: # pragma: no cover (pyramid 1.0.X)
-    # "pyramid.paster_templates" doesn't exist past 1.0.X
-    from pyramid.paster_templates import PyramidTemplate
-    from pyramid.paster_templates import paste_script_template_renderer
+    # "pyramid.paster.paste_script_template_renderer" doesn't exist past 1.0.X
+    from pyramid.paster import paste_script_template_renderer
+    from pyramid.paster import PyramidTemplate
 except ImportError: # pragma: no cover
     try: # pragma: no cover (pyramid 1.1.X, 1.2.X)
         # trying to import "paste_script_template_renderer" fails on 1.3.X