From: Kyle Manna <kyle@kylemanna.com>
Date: Mon, 21 Sep 2015 01:39:45 +0000 (-0700)
Subject: generator: Fix strange unicode/str issue in python2
X-Git-Tag: 5.0.2~186^2~111^2~1
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=67cafac8f2f4797e195c5ee1e1fcf691129f8694;p=apps%2Fagl-service-can-low-level.git

generator: Fix strange unicode/str issue in python2

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

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)