TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix stdpy error reporting in Python 2

Browse Source
This commit is contained in:
rdb 2015-10-10 14:33:53 +02:00
parent 62e8106ef1
commit 7004283150
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
direct/src/stdpy/file.py
View File

@ -19,13 +19,21 @@ from posixpath import join
_vfs = core.VirtualFileSystem.getGlobalPtr() _vfs = core.VirtualFileSystem.getGlobalPtr()
if sys.version < (3, 0):
# Python 3 defines these subtypes of IOError, but Python 2 doesn't.
FileNotFoundError = IOError
IsADirectoryError = IOError
FileExistsError = IOError
PermissionError = IOError
def open(file, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True): def open(file, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True):
if sys.version_info >= (3, 0): if sys.version_info >= (3, 0):
# Python 3 is much stricter than Python 2, which lets # Python 3 is much stricter than Python 2, which lets
# unknown flags fall through. # unknown flags fall through.
for ch in mode: for ch in mode:
if ch not in 'rwxabt+U': if ch not in 'rwxabt+U':
raise IOError("invalid mode: '%s'" % (mode)) raise ValueError("invalid mode: '%s'" % (mode))
creating = 'x' in mode creating = 'x' in mode
writing = 'w' in mode writing = 'w' in mode
@ -36,7 +44,7 @@ def open(file, mode='r', buffering=-1, encoding=None, errors=None, newline=None,
reading = universal or 'r' in mode reading = universal or 'r' in mode
if binary and 't' in mode: if binary and 't' in mode:
raise IOError("can't have text and binary mode at once") raise ValueError("can't have text and binary mode at once")
if creating + reading + writing + appending > 1: if creating + reading + writing + appending > 1:
raise ValueError("must have exactly one of create/read/write/append mode") raise ValueError("must have exactly one of create/read/write/append mode")