Changeset f88fcf3 in rtems-source-builder for source-builder/sb/reports.py

Timestamp:

Mar 7, 2016, 12:56:02 AM (4 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.11

Children:

e02eaa6

Parents:

76188ee4

git-author:

Chris Johns <chrisj@…> (03/07/16 00:56:02)

git-committer:

Chris Johns <chrisj@…> (03/07/16 02:16:17)

Message:

sb: Update code base to support Python3 and Python2.

Fix Windows support to allow MSYS2 Python to be used.

Updates #2619.

File:

• source-builder/sb/reports.py (modified) (11 diffs)

source-builder/sb/reports.py

@@ -23 +23 @@
 #
 
+from __future__ import print_function
+
 import copy
 import datetime
@@ -44 +46 @@
     import version
 except KeyboardInterrupt:
-    print 'user terminated'
+    print('user terminated', file = sys.stderr)
     sys.exit(1)
 except:
-    print 'error: unknown application load error'
+    print('error: unknown application load error', file = sys.stderr)
     sys.exit(1)
 
@@ -105 +107 @@
 
     def buildset_start(self, nest_level, name):
-        self.line('=-' * (_line_len / 2))
+        self.line('=-' * int(_line_len / 2))
         self.line('Build Set: (%d) %s' % (nest_level, name))
 
@@ -217 +219 @@
     def buildset_start(self, nest_level, name):
         h = '%s' % (name)
-        self.line('=%s %s' % ('=' * nest_level, h))
+        self.line('=%s %s' % ('=' * int(nest_level), h))
 
     def info(self, nest_level, name, info, separated):
@@ -267 +269 @@
 
     def post_process(self):
-        import StringIO
-        infile = StringIO.StringIO(self.content)
-        outfile = StringIO.StringIO()
+        import io
+        infile = io.StringIO(self.content)
+        outfile = io.StringIO()
         try:
             import asciidocapi
@@ -648 +650 @@
             if len(sources):
                 if 'sources' in tree:
-                    tree['sources'] = dict(tree['sources'].items() + sources.items())
+                    tree['sources'] = dict(list(tree['sources'].items()) + list(sources.items()))
                 else:
                     tree['sources'] = sources
             if len(patches):
                 if 'patches' in tree:
-                    tree['patches'] = dict(tree['patches'].items() + patches.items())
+                    tree['patches'] = dict(list(tree['patches'].items()) + list(patches.items()))
                 else:
                     tree['patches'] = patches
@@ -683 +685 @@
                 for f in range(0, len(files) - 1):
                     self.output('; %s  |- %s' % (prefix, files[f]))
-                if 'bset' in tree and len(tree['bset'].keys()):
+                if 'bset' in tree and len(list(tree['bset'].keys())):
                     c = '|'
                 else:
@@ -718 +720 @@
 
     def generate_ini(self):
-        nodes = sorted([node for node in self.tree.keys() if node != 'bset'])
+        nodes = sorted([node for node in list(self.tree.keys()) if node != 'bset'])
         self.output(';')
         self.output('; Configuration Tree:')
@@ -743 +745 @@
                 o.close()
                 del o
-            except IOError, err:
+            except IOError as err:
                 raise error.general('writing output file: %s: %s' % (name, err))
 
@@ -788 +790 @@
         if opts.get_arg('--output') and len(opts.params()) > 1:
             raise error.general('--output can only be used with a single config')
-        print 'RTEMS Source Builder, Reporter, %s' % (version.str())
+        print('RTEMS Source Builder, Reporter, %s' % (version.str()))
         opts.log_info()
         if not check.host_setup(opts):
@@ -828 +830 @@
         else:
             raise error.general('invalid config type: %s' % (config))
-    except error.general, gerr:
-        print gerr
+    except error.general as gerr:
+        print(gerr)
         sys.exit(1)
-    except error.internal, ierr:
-        print ierr
+    except error.internal as ierr:
+        print(ierr)
         sys.exit(1)
-    except error.exit, eerr:
+    except error.exit as eerr:
         pass
     except KeyboardInterrupt: