From b10123ff631f4e532fdaa721cdb89cc35732e3ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tin=20Tvrtkovi=C4=87?= Date: Thu, 10 May 2018 19:34:20 +0200 Subject: [PATCH] Python: return None for missing strings. (#4733) [BREAKING CHANGE] Python: return None for missing strings. --- src/idl_gen_python.cpp | 2 +- tests/MyGame/Example/Monster.py | 2 +- tests/MyGame/Example/Stat.py | 2 +- tests/py_test.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/idl_gen_python.cpp b/src/idl_gen_python.cpp index 7695155c8..17db56585 100644 --- a/src/idl_gen_python.cpp +++ b/src/idl_gen_python.cpp @@ -194,7 +194,7 @@ static void GetStringField(const StructDef &struct_def, const FieldDef &field, code += OffsetPrefix(field); code += Indent + Indent + Indent + "return " + GenGetter(field.value.type); code += "o + self._tab.Pos)\n"; - code += Indent + Indent + "return bytes()\n\n"; + code += Indent + Indent + "return None\n\n"; } // Get the value of a union from an object. diff --git a/tests/MyGame/Example/Monster.py b/tests/MyGame/Example/Monster.py index 1fe7cd70b..1e6a9658a 100644 --- a/tests/MyGame/Example/Monster.py +++ b/tests/MyGame/Example/Monster.py @@ -49,7 +49,7 @@ class Monster(object): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10)) if o != 0: return self._tab.String(o + self._tab.Pos) - return bytes() + return None # Monster def Inventory(self, j): diff --git a/tests/MyGame/Example/Stat.py b/tests/MyGame/Example/Stat.py index 2e0cc05c5..ae33aef3d 100644 --- a/tests/MyGame/Example/Stat.py +++ b/tests/MyGame/Example/Stat.py @@ -23,7 +23,7 @@ class Stat(object): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4)) if o != 0: return self._tab.String(o + self._tab.Pos) - return bytes() + return None # Stat def Val(self): diff --git a/tests/py_test.py b/tests/py_test.py index 1b76b61a1..e7c5b4806 100644 --- a/tests/py_test.py +++ b/tests/py_test.py @@ -917,7 +917,7 @@ class TestAllCodePathsOfExampleSchema(unittest.TestCase): self.assertEqual(100, self.mon.Hp()) def test_default_monster_name(self): - self.assertEqual(b'', self.mon.Name()) + self.assertEqual(None, self.mon.Name()) def test_default_monster_inventory_item(self): self.assertEqual(0, self.mon.Inventory(0))