fb236045de
- Cherry picked #10662 and fixed merge conflicts. - Manualy merged the change from #11904. - Did not merge #12236 since I'm not sure whether the issue affects Godot 2.1 and I don't have VS2013 to test. - Did not merge #11843 since it doesn't seem relevant (the code is only needed for creating DONORS.md, etc.). - Did not merge #10727 and #11752 since they seem to be already included in #11742. - The Windows and Linux builds have been tested with Scons 3.0 using Python 3. - OSX and iOS should hopefully work but are not tested since I don't have a Mac. - Builds using SCons 2.5 and Python 2 should not be impacted.
32 lines
805 B
Python
32 lines
805 B
Python
import sys
|
|
|
|
if sys.version_info < (3,):
|
|
def isbasestring(s):
|
|
return isinstance(s, basestring)
|
|
def open_utf8(filename, mode):
|
|
return open(filename, mode)
|
|
def byte_to_str(x):
|
|
return str(ord(x))
|
|
import cStringIO
|
|
def StringIO():
|
|
return cStringIO.StringIO()
|
|
def encode_utf8(x):
|
|
return x
|
|
def iteritems(d):
|
|
return d.iteritems()
|
|
else:
|
|
def isbasestring(s):
|
|
return isinstance(s, (str, bytes))
|
|
def open_utf8(filename, mode):
|
|
return open(filename, mode, encoding="utf-8")
|
|
def byte_to_str(x):
|
|
return str(x)
|
|
import io
|
|
def StringIO():
|
|
return io.StringIO()
|
|
import codecs
|
|
def encode_utf8(x):
|
|
return codecs.utf_8_encode(x)[0]
|
|
def iteritems(d):
|
|
return iter(d.items())
|