TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

VFSImporter: fix detection of source file encoding in Python 3

Browse Source 
Incidentally, this should (in theory) also fix the _bootlocale import loop referenced in #1065
This commit is contained in:
rdb 2020-12-09 15:46:51 +01:00
parent 7b4ecbd60f
commit 35eeb27386
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
direct/src/showbase/VFSImporter.py
View File

@ -65,7 +65,7 @@ class VFSImporter:
vfile = vfs.getFile(filename, True) vfile = vfs.getFile(filename, True)
if vfile: if vfile:
return VFSLoader(dir_path, vfile, filename, return VFSLoader(dir_path, vfile, filename,
desc=('.py', 'r', imp.PY_SOURCE)) desc=('.py', 'U' if sys.version_info < (3, 4) else 'r', imp.PY_SOURCE))
# If there's no .py file, but there's a .pyc file, load that # If there's no .py file, but there's a .pyc file, load that
# anyway. # anyway.
@ -93,7 +93,7 @@ class VFSImporter:
vfile = vfs.getFile(filename, True) vfile = vfs.getFile(filename, True)
if vfile: if vfile:
return VFSLoader(dir_path, vfile, filename, packagePath=path, return VFSLoader(dir_path, vfile, filename, packagePath=path,
desc=('.py', 'r', imp.PY_SOURCE)) desc=('.py', 'U' if sys.version_info < (3, 4) else 'r', imp.PY_SOURCE))
for ext in compiledExtensions: for ext in compiledExtensions:
filename = Filename(path, '__init__.' + ext) filename = Filename(path, '__init__.' + ext)
vfile = vfs.getFile(filename, True) vfile = vfs.getFile(filename, True)
@ -181,6 +181,14 @@ class VFSLoader:
filename = Filename(self.filename) filename = Filename(self.filename)
filename.setExtension('py') filename.setExtension('py')
filename.setText() filename.setText()
if sys.version_info >= (3, 0):
# Use the tokenize module to detect the encoding.
import tokenize
fh = open(self.filename, 'rb')
encoding, lines = tokenize.detect_encoding(fh.readline)
return (b''.join(lines) + fh.read()).decode(encoding)
else:
return open(self.filename, self.desc[1]).read() return open(self.filename, self.desc[1]).read()
def _import_extension_module(self, fullname): def _import_extension_module(self, fullname):