From bbca0d9e1db4710b523271399b3fae89d9993eb7 Mon Sep 17 00:00:00 2001 From: Lakshmi Vyasarajan Date: Thu, 26 Jan 2012 14:51:04 +0530 Subject: Fixed a `TypeError` caused because of `unicode` issues in python 2.7.x --- cheetah/Version.py | 2 +- cheetah/convertTmplPathToModuleName.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cheetah/Version.py b/cheetah/Version.py index f01d1cd..94f007f 100644 --- 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 index 264f18e..7c8a3ce 100644 --- 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 \ No newline at end of file -- cgit v1.2.1