generator: Fix strange unicode/str issue in python2

* Work around this by checking the appropriate class for the given
* environment.

1 files changed, 8 insertions, 1 deletions

diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py
index 91a820f3..df973386 100755
--- a/generator/nanopb_generator.py
+++ b/generator/nanopb_generator.py
@@ -85,7 +85,14 @@ class Names:
         return '_'.join(self.parts)
 
     def __add__(self, other):
-        if isinstance(other, str):
+        # The fdesc names are unicode and need to be handled for
+        # python2 and python3
+        try:
+              realstr = unicode
+        except NameError:
+              realstr = str
+
+        if isinstance(other, realstr):
             return Names(self.parts + (other,))
         elif isinstance(other, tuple):
             return Names(self.parts + other)