Permalink
Browse files

Merge pull request #11 from bukzor/master

restore compatibility with 2.4.5
  • Loading branch information...
2 parents f468c96 + 1ba4577 commit de1e19500156212fcce1bed421cb29595bede432 @Roguelazer Roguelazer committed Jul 14, 2012
Showing with 10 additions and 4 deletions.
  1. +8 −2 cheetah/Compiler.py
  2. +2 −2 cheetah/Version.py
View
@@ -1664,13 +1664,19 @@ def _setupCompilerState(self):
"import types",
"from Cheetah.Version import MinCompatibleVersion as RequiredCheetahVersion",
"from Cheetah.Version import MinCompatibleVersionTuple as RequiredCheetahVersionTuple",
- "from Cheetah.Template import Template, NO_CONTENT",
+ "from Cheetah.Template import Template",
"from Cheetah.DummyTransaction import *",
"from Cheetah.NameMapper import NotFound, valueForName, valueFromSearchList, valueFromFrameOrSearchList",
"from Cheetah.CacheRegion import CacheRegion",
"import Cheetah.Filters as Filters",
"import Cheetah.ErrorCatchers as ErrorCatchers",
- ]
+ "",
+ "try:",
+ " #Backward compatibility with 2.4.5",
+ " from Cheetah.Template import NO_CONTENT",
+ "except ImportError:",
+ " NO_CONTENT = None",
+ ]
self._importedVarNames = ['sys',
'os',
View
@@ -1,5 +1,5 @@
-Version = '2.4.6'
-VersionTuple = (2, 4, 6, 'development', 0)
+Version = '2.4.7'
+VersionTuple = (2, 4, 7, 'development', 0)
MinCompatibleVersion = '2.0rc6'
MinCompatibleVersionTuple = (2, 0, 0, 'candidate', 6)

0 comments on commit de1e195

Please sign in to comment.