From: Kyle Manna <kyle@kylemanna.com>
Date: Sat, 19 Sep 2015 22:13:05 +0000 (-0700)
Subject: generator: Strings are utf-8 by default in python3
X-Git-Tag: 5.0.2~186^2~111^2~3
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=03e3af597f0adf64b21731b820c997116a16cdcd;p=apps%2Fagl-service-can-low-level.git

generator: Strings are utf-8 by default in python3

* Not sure how to handle this case in python2, seems to work
* Python 3 doesn't need this since all strings are utf-8
---

diff --git a/generator/nanopb_generator.py b/generator/nanopb_generator.py
index f7d43221..78140a4c 100755
--- a/generator/nanopb_generator.py
+++ b/generator/nanopb_generator.py
@@ -379,12 +379,10 @@ class Field:
                 inner_init = '0'
         else:
             if self.pbtype == 'STRING':
-                inner_init = self.default.encode('utf-8').encode('string_escape')
-                inner_init = inner_init.replace('"', '\\"')
+                inner_init = self.default.replace('"', '\\"')
                 inner_init = '"' + inner_init + '"'
             elif self.pbtype == 'BYTES':
-                data = str(self.default).decode('string_escape')
-                data = ['0x%02x' % ord(c) for c in data]
+                data = ['0x%02x' % ord(c) for c in self.default]
                 if len(data) == 0:
                     inner_init = '{0, {0}}'
                 else: