projects
/
platform
/
upstream
/
flatbuffers.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bf07c37
af23683
)
Merge pull request #3491 from faizanrashid/master
author
Robert
<me@rwinslow.com>
Wed, 20 Jan 2016 01:56:26 +0000
(17:56 -0800)
committer
Robert
<me@rwinslow.com>
Wed, 20 Jan 2016 01:56:26 +0000
(17:56 -0800)
[BUG FIX] [MINOR] Fix encoding with unicode characters.
1
2
python/flatbuffers/builder.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
python/flatbuffers/builder.py
index
7d4222e
,
8ca0e93
..
18cfab9
---
1
/
python/flatbuffers/builder.py
---
2
/
python/flatbuffers/builder.py
+++ b/
python/flatbuffers/builder.py
@@@
-395,12
-365,10
+395,12
@@@
class Builder(object)
"""CreateString writes a null-terminated byte string as a vector."""
self.assertNotNested()
+ ## @cond FLATBUFFERS_INTERNAL
self.nested = True
+ ## @endcond
if isinstance(s, compat.string_types):
- x = s.encode()
+ x = s.encode(
encoding, errors
)
elif isinstance(s, compat.binary_type):
x = s
else: