BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-28 08:18:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3806 from mediagraph/fix-create-string

Browse Source 
Fix CreateString with already-encoded string or bytearray in Python 2.7.
This commit is contained in:
Robert
2016-04-27 20:31:55 -07:00
parent 7cce55d8f0 1e7310e6cd
commit 77742a3fba
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/flatbuffers/builder.py
View File

@@ -401,7 +401,7 @@ class Builder(object):
if isinstance(s, compat.string_types): if isinstance(s, compat.string_types):
x = s.encode(encoding, errors) x = s.encode(encoding, errors)
elif isinstance(s, compat.binary_type): elif isinstance(s, compat.binary_types):
x = s x = s
else: else:
raise TypeError("non-string passed to CreateString") raise TypeError("non-string passed to CreateString")

9
python/flatbuffers/compat.py
View File

@@ -11,13 +11,16 @@ PY34 = sys.version_info[0:2] >= (3, 4)
if PY3: if PY3:
string_types = (str,) string_types = (str,)
binary_type = bytes binary_types = (bytes,bytearray)
range_func = range range_func = range
memoryview_type = memoryview memoryview_type = memoryview
struct_bool_decl = "?" struct_bool_decl = "?"
else: else:
string_types = (basestring,) string_types = (unicode,)
binary_type = str if PY26 or PY27:
binary_types = (str,bytearray)
else:
binary_types = (str,)
range_func = xrange range_func = xrange
if PY26 or (PY27 and not PY275): if PY26 or (PY27 and not PY275):
memoryview_type = buffer memoryview_type = buffer