suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fixes #0002238: Python: Environment Variable 'path' with mutated vowel

Browse Source
This commit is contained in:
wmayer 2015-09-05 14:52:06 +02:00
parent 220afa90db
commit 4da63d1d03
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/App/FreeCADInit.py
View File

@ -107,6 +107,16 @@ def InitApplications():
# new paths must be prepended to avoid to load a wrong version of a library
try:
os.environ["PATH"] = PathExtension + os.environ["PATH"]
except UnicodeDecodeError:
# See #0002238. FIXME: check again once ported to Python 3.x
Log('UnicodeDecodeError was raised when concatenating unicode string with PATH. Try to remove non-ascii paths...')
path = os.environ["PATH"].split(os.pathsep)
cleanpath=[]
for i in path:
if test_ascii(i):
cleanpath.append(i)
os.environ["PATH"] = PathExtension + os.pathsep.join(cleanpath)
Log('done\n')
except KeyError:
os.environ["PATH"] = PathExtension
path = os.environ["PATH"].split(os.pathsep)
@ -126,6 +136,7 @@ Log = FreeCAD.Console.PrintLog
Msg = FreeCAD.Console.PrintMessage
Err = FreeCAD.Console.PrintError
Wrn = FreeCAD.Console.PrintWarning
test_ascii = lambda s: all(ord(c) < 128 for c in s)
Log ('Init: starting App::FreeCADInit.py\n')
@ -236,6 +247,7 @@ App.Units.Power = App.Units.Unit(2,1,-3)
# clean up namespace
del(InitApplications)
del(test_ascii)
Log ('Init: App::FreeCADInit.py done\n')