Permalink
Browse files

Prevent import warning when installed on Pyramid 1.2.

  • Loading branch information...
1 parent fa3649c commit 29fe6279aa0e383ee721b464bc71110ef90e5bd4 @mcdonc mcdonc committed Dec 15, 2011
Showing with 8 additions and 5 deletions.
  1. +5 −0 CHANGES.txt
  2. +3 −5 pyramid_jqm/scaffolds/__init__.py
View
@@ -1,3 +1,8 @@
+Next release
+============
+
+- Prevent import warning when installed on Pyramid 1.2.
+
0.2 (2011-12-14)
================
@@ -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

0 comments on commit 29fe627

Please sign in to comment.