diff options
| author | R. Tyler Croy <tyler@monkeypox.org> | 2012-01-28 11:03:57 -0800 |
|---|---|---|
| committer | R. Tyler Croy <tyler@monkeypox.org> | 2012-01-28 11:03:57 -0800 |
| commit | ca28a26bad5626f94e074975e808732fc0701983 (patch) | |
| tree | 8fa033eac203c7d7c30ec59da83803645c55f2a8 | |
| parent | 073876f66e35501e289cc5dd1d60672e88c893f2 (diff) | |
| parent | bbca0d9e1db4710b523271399b3fae89d9993eb7 (diff) | |
| download | python-cheetah-ca28a26bad5626f94e074975e808732fc0701983.tar.gz | |
Merge pull request #1 from lakshmivyas/master
Fix for `TypeError` caused by unicode issues.
| -rw-r--r-- | cheetah/Version.py | 2 | ||||
| -rw-r--r-- | 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 |