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

Allow passing a unicode object to write() in Python 2

Browse Source
This commit is contained in:
rdb 2015-10-22 23:06:18 +02:00
parent 668e60e386
commit 6714de8090
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,6 +185,13 @@ class StreamIOWrapper(io.IOBase):
if isinstance(stream, core.Ostream): if isinstance(stream, core.Ostream):
self.__writer = core.StreamWriter(stream, False) self.__writer = core.StreamWriter(stream, False)
self.__lastWrite = True self.__lastWrite = True
if sys.version_info >= (3, 0):
# In Python 3, we use appendData, which only accepts bytes.
self.__write = self.__writer.appendData
else:
# In Python 2.7, we also accept unicode objects, which are
# implicitly converted to C++ strings.
self.__write = self.__writer.write
def __repr__(self): def __repr__(self):
s = "<direct.stdpy.file.StreamIOWrapper" s = "<direct.stdpy.file.StreamIOWrapper"
@ -283,7 +290,7 @@ class StreamIOWrapper(io.IOBase):
raise IOError("Attempt to write to read-only stream") raise IOError("Attempt to write to read-only stream")
self.__stream.clear() # clear eof flag self.__stream.clear() # clear eof flag
self.__writer.appendData(b) self.__write(b)
self.__lastWrite = True self.__lastWrite = True
def writelines(self, lines): def writelines(self, lines):
@ -297,7 +304,7 @@ class StreamIOWrapper(io.IOBase):
self.__stream.clear() # clear eof flag self.__stream.clear() # clear eof flag
for line in lines: for line in lines:
self.__writer.appendData(line) self.__write(line)
self.__lastWrite = True self.__lastWrite = True