commit 24aa9747d04bf9738dd8d4b9c9309bb49336a123
author Jamie Madill <jmadill@chromium.org> Tue Dec 13 17:02:57 2016 -0500
committer Mark Lobodzinski <mark@lunarg.com> Mon Dec 19 13:38:07 2016 -0700
tree f94c8979553d9bdfaff3d7ca345975a2a3dbd15d
parent 57016fdf675f56afe30d8c415f54fd5d61da0180

layers: Make generators Python 2.7-compatible.

ANGLE and Chromium are fixed with Python 2.7, so we need to update
the generator to something that is compatible with 2.7 and 3.2.
The unicode handling is different between the two, so switch
scripts to use unicode literals (u'txt' instead of 'txt').

Change-Id: I1570a45e302a09bb1f99eabc84f50b2ec599944d

scripts/parameter_validation_generator.py

diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
index 7c78b5f..3b46cb1 100644
--- a/scripts/parameter_validation_generator.py
+++ b/scripts/parameter_validation_generator.py
@@ -264,7 +264,7 @@
                 if (self.genOpts.protectProto):
                     write(self.genOpts.protectProto,
                           self.genOpts.protectProtoStr, file=self.outFile)
-                write('\n'.join(self.sections['command']), end='', file=self.outFile)
+                write('\n'.join(self.sections['command']), end=u'', file=self.outFile)
             if (self.featureExtraProtect != None):
                 write('#endif /*', self.featureExtraProtect, '*/', file=self.outFile)
             else:

scripts/threading_generator.py

diff --git a/scripts/threading_generator.py b/scripts/threading_generator.py
index 0d0df12..8dfdb7e 100644
--- a/scripts/threading_generator.py
+++ b/scripts/threading_generator.py
@@ -325,7 +325,7 @@
                     self.newline()
             #write('// endFeature looking at self.sections[command]', file=self.outFile)
             if (self.sections['command']):
-                write('\n'.join(self.sections['command']), end='', file=self.outFile)
+                write('\n'.join(self.sections['command']), end=u'', file=self.outFile)
                 self.newline()
             if (self.featureExtraProtect != None):
                 write('#endif /*', self.featureExtraProtect, '*/', file=self.outFile)

scripts/unique_objects_generator.py

diff --git a/scripts/unique_objects_generator.py b/scripts/unique_objects_generator.py
index af59da4..46b7d8f 100644
--- a/scripts/unique_objects_generator.py
+++ b/scripts/unique_objects_generator.py
@@ -125,7 +125,7 @@
         self.intercepts = []
         # Commands which are not autogenerated but still intercepted
         self.no_autogen_list = [
-            'vkGetDeviceProcAddr', 
+            'vkGetDeviceProcAddr',
             'vkGetInstanceProcAddr',
             'vkCreateInstance',
             'vkDestroyInstance',
@@ -234,7 +234,7 @@
                 if (self.genOpts.protectProto):
                     write(self.genOpts.protectProto,
                           self.genOpts.protectProtoStr, file=self.outFile)
-                write('\n'.join(self.sections['command']), end='', file=self.outFile)
+                write('\n'.join(self.sections['command']), end=u'', file=self.outFile)
             if (self.featureExtraProtect != None):
                 write('\n#endif //', self.featureExtraProtect, file=self.outFile)
             else:
@@ -536,7 +536,7 @@
         for member in members:
             # Handle NDOs
             if self.isHandleTypeNonDispatchable(member.type) == True:
-                count_name = member.len  
+                count_name = member.len
                 if (count_name is not None):
                     if first_level_param == False:
                         count_name = '%s%s' % (prefix, member.len)