Merge pull request #1 from lakshmivyas/master

Fix for `TypeError` caused by unicode issues.
cheetahtemplate · Jan 28, 2012 · ca28a26 · ca28a26
2 parents 073876f + bbca0d9
commit ca28a26
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/cheetah/Version.py b/cheetah/Version.py
@@ -1,5 +1,5 @@
 Version = '2.4.4'
-VersionTuple = (2, 4, 4, 'development', 0)
+VersionTuple = (2, 4, 4, 'development', 1)
 
 MinCompatibleVersion = '2.0rc6'
 MinCompatibleVersionTuple = (2, 0, 0, 'candidate', 6)

diff --git a/cheetah/convertTmplPathToModuleName.py b/cheetah/convertTmplPathToModuleName.py
@@ -17,4 +17,8 @@ def convertTmplPathToModuleName(tmplPath,
                                 _pathNameTransChars=_pathNameTransChars,
                                 splitdrive=os.path.splitdrive,
                                 ):
-    return splitdrive(tmplPath)[1].translate(_pathNameTransChars)
+    try:
+        moduleName = splitdrive(tmplPath)[1].translate(_pathNameTransChars)
+    except (UnicodeError, TypeError):
+        moduleName = unicode(splitdrive(tmplPath)[1]).translate(unicode(_pathNameTransChars))
+    return moduleName