Blame SOURCES/port-scripts-to-python3.patch

029efc
diff --git a/event_rpcgen.py b/event_rpcgen.py
029efc
index 9baf730..2004090 100755
029efc
--- a/event_rpcgen.py
029efc
+++ b/event_rpcgen.py
029efc
@@ -1,4 +1,4 @@
029efc
-#!/usr/bin/env python2
029efc
+#!/usr/bin/env python
029efc
 #
029efc
 # Copyright (c) 2005-2007 Niels Provos <provos@citi.umich.edu>
029efc
 # Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
029efc
@@ -36,10 +36,10 @@ QUIETLY = 0
029efc
 
029efc
 def declare(s):
029efc
     if not QUIETLY:
029efc
-        print s
029efc
+        print(s)
029efc
 
029efc
 def TranslateList(mylist, mydict):
029efc
-    return map(lambda x: x % mydict, mylist)
029efc
+    return [x % mydict for x in mylist]
029efc
 
029efc
 # Exception class for parse errors
029efc
 class RpcGenError(Exception):
029efc
@@ -57,7 +57,7 @@ class Struct:
029efc
         declare('  Created struct: %s' % name)
029efc
 
029efc
     def AddEntry(self, entry):
029efc
-        if self._tags.has_key(entry.Tag()):
029efc
+        if entry.Tag() in self._tags:
029efc
             raise RpcGenError(
029efc
                 'Entry "%s" duplicates tag number %d from "%s" '
029efc
                 'around line %d' % (entry.Name(), entry.Tag(),
029efc
@@ -78,7 +78,7 @@ class Struct:
029efc
     def PrintIndented(self, file, ident, code):
029efc
         """Takes an array, add indentation to each entry and prints it."""
029efc
         for entry in code:
029efc
-            print >>file, '%s%s' % (ident, entry)
029efc
+            file.write('%s%s\n' % (ident, entry))
029efc
 
029efc
 class StructCCode(Struct):
029efc
     """ Knows how to generate C code for a struct """
029efc
@@ -88,20 +88,19 @@ class StructCCode(Struct):
029efc
 
029efc
     def PrintTags(self, file):
029efc
         """Prints the tag definitions for a structure."""
029efc
-        print >>file, '/* Tag definition for %s */' % self._name
029efc
-        print >>file, 'enum %s_ {' % self._name.lower()
029efc
+        file.write('/* Tag definition for %s */\n' % self._name)
029efc
+        file.write('enum %s_ {\n' % self._name.lower())
029efc
         for entry in self._entries:
029efc
-            print >>file, '  %s=%d,' % (self.EntryTagName(entry),
029efc
-                                        entry.Tag())
029efc
-        print >>file, '  %s_MAX_TAGS' % (self._name.upper())
029efc
-        print >>file, '};\n'
029efc
+            file.write('  %s=%d,\n' % (self.EntryTagName(entry), entry.Tag()))
029efc
+        file.write('  %s_MAX_TAGS\n' % (self._name.upper()))
029efc
+        file.write('};\n\n')
029efc
 
029efc
     def PrintForwardDeclaration(self, file):
029efc
-        print >>file, 'struct %s;' % self._name
029efc
+        file.write('struct %s;\n' % self._name)
029efc
 
029efc
     def PrintDeclaration(self, file):
029efc
-        print >>file, '/* Structure declaration for %s */' % self._name
029efc
-        print >>file, 'struct %s_access_ {' % self._name
029efc
+        file.write('/* Structure declaration for %s */\n' % self._name)
029efc
+        file.write('struct %s_access_ {\n' % self._name)
029efc
         for entry in self._entries:
029efc
             dcl = entry.AssignDeclaration('(*%s_assign)' % entry.Name())
029efc
             dcl.extend(
029efc
@@ -110,20 +109,19 @@ class StructCCode(Struct):
029efc
                 dcl.extend(
029efc
                     entry.AddDeclaration('(*%s_add)' % entry.Name()))
029efc
             self.PrintIndented(file, '  ', dcl)
029efc
-        print >>file, '};\n'
029efc
+        file.write('};\n\n')
029efc
 
029efc
-        print >>file, 'struct %s {' % self._name
029efc
-        print >>file, '  struct %s_access_ *base;\n' % self._name
029efc
+        file.write('struct %s {\n' % self._name)
029efc
+        file.write('  struct %s_access_ *base;\n\n' % self._name)
029efc
         for entry in self._entries:
029efc
             dcl = entry.Declaration()
029efc
             self.PrintIndented(file, '  ', dcl)
029efc
-        print >>file, ''
029efc
+        file.write('\n')
029efc
         for entry in self._entries:
029efc
-            print >>file, '  ev_uint8_t %s_set;' % entry.Name()
029efc
-        print >>file, '};\n'
029efc
+            file.write('  ev_uint8_t %s_set;\n' % entry.Name())
029efc
+        file.write('};\n\n')
029efc
 
029efc
-        print >>file, \
029efc
-"""struct %(name)s *%(name)s_new(void);
029efc
+        file.write("""struct %(name)s *%(name)s_new(void);
029efc
 struct %(name)s *%(name)s_new_with_arg(void *);
029efc
 void %(name)s_free(struct %(name)s *);
029efc
 void %(name)s_clear(struct %(name)s *);
029efc
@@ -133,7 +131,7 @@ int %(name)s_complete(struct %(name)s *);
029efc
 void evtag_marshal_%(name)s(struct evbuffer *, ev_uint32_t,
029efc
     const struct %(name)s *);
029efc
 int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
029efc
-    struct %(name)s *);""" % { 'name' : self._name }
029efc
+    struct %(name)s *);\n""" % { 'name' : self._name })
029efc
 
029efc
 
029efc
         # Write a setting function of every variable
029efc
@@ -146,22 +144,21 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
029efc
                 self.PrintIndented(file, '', entry.AddDeclaration(
029efc
                     entry.AddFuncName()))
029efc
 
029efc
-        print >>file, '/* --- %s done --- */\n' % self._name
029efc
+        file.write('/* --- %s done --- */\n\n' % self._name)
029efc
 
029efc
     def PrintCode(self, file):
029efc
-        print >>file, ('/*\n'
029efc
+        file.write(('/*\n'
029efc
                        ' * Implementation of %s\n'
029efc
-                       ' */\n') % self._name
029efc
+                       ' */\n\n') % self._name)
029efc
 
029efc
-        print >>file, \
029efc
-              'static struct %(name)s_access_ %(name)s_base__ = {' % \
029efc
-              { 'name' : self._name }
029efc
+        file.write('static struct %(name)s_access_ %(name)s_base__ = {\n' % \
029efc
+              { 'name' : self._name })
029efc
         for entry in self._entries:
029efc
             self.PrintIndented(file, '  ', entry.CodeBase())
029efc
-        print >>file, '};\n'
029efc
+        file.write('};\n\n')
029efc
 
029efc
         # Creation
029efc
-        print >>file, (
029efc
+        file.write((
029efc
             'struct %(name)s *\n'
029efc
             '%(name)s_new(void)\n'
029efc
             '{\n'
029efc
@@ -176,77 +173,77 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
029efc
             '    event_warn("%%s: malloc", __func__);\n'
029efc
             '    return (NULL);\n'
029efc
             '  }\n'
029efc
-            '  tmp->base = &%(name)s_base__;\n') % { 'name' : self._name }
029efc
+            '  tmp->base = &%(name)s_base__;\n\n') % { 'name' : self._name })
029efc
 
029efc
         for entry in self._entries:
029efc
             self.PrintIndented(file, '  ', entry.CodeInitialize('tmp'))
029efc
-            print >>file, '  tmp->%s_set = 0;\n' % entry.Name()
029efc
+            file.write('  tmp->%s_set = 0;\n\n' % entry.Name())
029efc
 
029efc
-        print >>file, (
029efc
+        file.write((
029efc
             '  return (tmp);\n'
029efc
-            '}\n')
029efc
+            '}\n\n'))
029efc
 
029efc
         # Adding
029efc
         for entry in self._entries:
029efc
             if entry.Array():
029efc
                 self.PrintIndented(file, '', entry.CodeAdd())
029efc
-            print >>file, ''
029efc
+            file.write('\n')
029efc
 
029efc
         # Assigning
029efc
         for entry in self._entries:
029efc
             self.PrintIndented(file, '', entry.CodeAssign())
029efc
-            print >>file, ''
029efc
+            file.write('\n')
029efc
 
029efc
         # Getting
029efc
         for entry in self._entries:
029efc
             self.PrintIndented(file, '', entry.CodeGet())
029efc
-            print >>file, ''
029efc
+            file.write('\n')
029efc
 
029efc
         # Clearing
029efc
-        print >>file, ( 'void\n'
029efc
+        file.write(( 'void\n'
029efc
                         '%(name)s_clear(struct %(name)s *tmp)\n'
029efc
                         '{'
029efc
-                        ) % { 'name' : self._name }
029efc
+                        '\n') % { 'name' : self._name })
029efc
         for entry in self._entries:
029efc
             self.PrintIndented(file, '  ', entry.CodeClear('tmp'))
029efc
 
029efc
-        print >>file, '}\n'
029efc
+        file.write('}\n\n')
029efc
 
029efc
         # Freeing
029efc
-        print >>file, ( 'void\n'
029efc
+        file.write(( 'void\n'
029efc
                         '%(name)s_free(struct %(name)s *tmp)\n'
029efc
                         '{'
029efc
-                        ) % { 'name' : self._name }
029efc
+                        '\n') % { 'name' : self._name })
029efc
 
029efc
         for entry in self._entries:
029efc
             self.PrintIndented(file, '  ', entry.CodeFree('tmp'))
029efc
 
029efc
-        print >>file, ('  free(tmp);\n'
029efc
-                       '}\n')
029efc
+        file.write(('  free(tmp);\n'
029efc
+                       '}\n\n'))
029efc
 
029efc
         # Marshaling
029efc
-        print >>file, ('void\n'
029efc
+        file.write(('void\n'
029efc
                        '%(name)s_marshal(struct evbuffer *evbuf, '
029efc
                        'const struct %(name)s *tmp)'
029efc
-                       '{') % { 'name' : self._name }
029efc
+                       '{\n') % { 'name' : self._name })
029efc
         for entry in self._entries:
029efc
             indent = '  '
029efc
             # Optional entries do not have to be set
029efc
             if entry.Optional():
029efc
                 indent += '  '
029efc
-                print >>file, '  if (tmp->%s_set) {' % entry.Name()
029efc
+                file.write('  if (tmp->%s_set) {\n' % entry.Name())
029efc
             self.PrintIndented(
029efc
                 file, indent,
029efc
                 entry.CodeMarshal('evbuf', self.EntryTagName(entry),
029efc
                                   entry.GetVarName('tmp'),
029efc
                                   entry.GetVarLen('tmp')))
029efc
             if entry.Optional():
029efc
-                print >>file, '  }'
029efc
+                file.write('  }\n')
029efc
 
029efc
-        print >>file, '}\n'
029efc
+        file.write('}\n\n')
029efc
 
029efc
         # Unmarshaling
029efc
-        print >>file, ('int\n'
029efc
+        file.write(('int\n'
029efc
                        '%(name)s_unmarshal(struct %(name)s *tmp, '
029efc
                        ' struct evbuffer *evbuf)\n'
029efc
                        '{\n'
029efc
@@ -255,14 +252,14 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
029efc
                        '    if (evtag_peek(evbuf, &tag) == -1)\n'
029efc
                        '      return (-1);\n'
029efc
                        '    switch (tag) {\n'
029efc
-                       ) % { 'name' : self._name }
029efc
+                       '\n') % { 'name' : self._name })
029efc
         for entry in self._entries:
029efc
-            print >>file, '      case %s:\n' % self.EntryTagName(entry)
029efc
+            file.write('      case %s:\n' % self.EntryTagName(entry))
029efc
             if not entry.Array():
029efc
-                print >>file, (
029efc
+                file.write((
029efc
                     '        if (tmp->%s_set)\n'
029efc
                     '          return (-1);'
029efc
-                    ) % (entry.Name())
029efc
+                    '\n') % (entry.Name()))
029efc
 
029efc
             self.PrintIndented(
029efc
                 file, '        ',
029efc
@@ -271,26 +268,26 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
029efc
                                     entry.GetVarName('tmp'),
029efc
                                     entry.GetVarLen('tmp')))
029efc
 
029efc
-            print >>file, ( '        tmp->%s_set = 1;\n' % entry.Name() +
029efc
-                            '        break;\n' )
029efc
-        print >>file, ( '      default:\n'
029efc
+            file.write(( '        tmp->%s_set = 1;\n' % entry.Name() +
029efc
+                            '        break;\n' ))
029efc
+        file.write(( '      default:\n'
029efc
                         '        return -1;\n'
029efc
                         '    }\n'
029efc
-                        '  }\n' )
029efc
+                        '  }\n\n' ))
029efc
         # Check if it was decoded completely
029efc
-        print >>file, ( '  if (%(name)s_complete(tmp) == -1)\n'
029efc
+        file.write(( '  if (%(name)s_complete(tmp) == -1)\n'
029efc
                         '    return (-1);'
029efc
-                        ) % { 'name' : self._name }
029efc
+                        '\n') % { 'name' : self._name })
029efc
 
029efc
         # Successfully decoded
029efc
-        print >>file, ( '  return (0);\n'
029efc
-                        '}\n')
029efc
+        file.write(( '  return (0);\n'
029efc
+                        '}\n\n'))
029efc
 
029efc
         # Checking if a structure has all the required data
029efc
-        print >>file, (
029efc
+        file.write((
029efc
             'int\n'
029efc
             '%(name)s_complete(struct %(name)s *msg)\n'
029efc
-            '{' ) % { 'name' : self._name }
029efc
+            '{\n' ) % { 'name' : self._name })
029efc
         for entry in self._entries:
029efc
             if not entry.Optional():
029efc
                 code = [
029efc
@@ -303,12 +300,12 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
029efc
             self.PrintIndented(
029efc
                 file, '  ',
029efc
                 entry.CodeComplete('msg', entry.GetVarName('msg')))
029efc
-        print >>file, (
029efc
+        file.write((
029efc
             '  return (0);\n'
029efc
-            '}\n' )
029efc
+            '}\n\n' ))
029efc
 
029efc
         # Complete message unmarshaling
029efc
-        print >>file, (
029efc
+        file.write((
029efc
             'int\n'
029efc
             'evtag_unmarshal_%(name)s(struct evbuffer *evbuf, '
029efc
             'ev_uint32_t need_tag, struct %(name)s *msg)\n'
029efc
@@ -330,10 +327,10 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
029efc
             ' error:\n'
029efc
             '  evbuffer_free(tmp);\n'
029efc
             '  return (res);\n'
029efc
-            '}\n' ) % { 'name' : self._name }
029efc
+            '}\n\n' ) % { 'name' : self._name })
029efc
 
029efc
         # Complete message marshaling
029efc
-        print >>file, (
029efc
+        file.write((
029efc
             'void\n'
029efc
             'evtag_marshal_%(name)s(struct evbuffer *evbuf, ev_uint32_t tag, '
029efc
             'const struct %(name)s *msg)\n'
029efc
@@ -343,7 +340,7 @@ int evtag_unmarshal_%(name)s(struct evbuffer *, ev_uint32_t,
029efc
             '  %(name)s_marshal(buf_, msg);\n'
029efc
             '  evtag_marshal_buffer(evbuf, tag, buf_);\n '
029efc
             '  evbuffer_free(buf_);\n'
029efc
-            '}\n' ) % { 'name' : self._name }
029efc
+            '}\n\n' ) % { 'name' : self._name })
029efc
 
029efc
 class Entry:
029efc
     def __init__(self, type, name, tag):
029efc
@@ -420,7 +417,7 @@ class Entry:
029efc
             "optaddarg" :
029efc
             self._optaddarg and ", const %s value" % self._ctype or ""
029efc
             }
029efc
-        for (k, v) in extradict.items():
029efc
+        for (k, v) in list(extradict.items()):
029efc
             mapping[k] = v
029efc
 
029efc
         return mapping
029efc
@@ -1127,7 +1124,7 @@ class EntryArray(Entry):
029efc
 
029efc
         codearrayassign = self._entry.CodeArrayAssign(
029efc
             'msg->%(name)s_data[off]' % self.GetTranslation(), 'value')
029efc
-        code += map(lambda x: '    ' + x, codearrayassign)
029efc
+        code += ['    ' + x for x in codearrayassign]
029efc
 
029efc
         code += TranslateList([
029efc
             '  }',
029efc
@@ -1168,7 +1165,7 @@ class EntryArray(Entry):
029efc
 
029efc
         code = TranslateList(code, self.GetTranslation())
029efc
 
029efc
-        code += map(lambda x: '  ' + x, codearrayadd)
029efc
+        code += ['  ' + x for x in codearrayadd]
029efc
 
029efc
         code += TranslateList([
029efc
             '  msg->%(name)s_set = 1;',
029efc
@@ -1196,7 +1193,7 @@ class EntryArray(Entry):
029efc
 
029efc
         code = TranslateList(code, translate)
029efc
 
029efc
-        code += map(lambda x: '    ' + x, tmp)
029efc
+        code += ['    ' + x for x in tmp]
029efc
 
029efc
         code += [
029efc
             '  }',
029efc
@@ -1261,7 +1258,7 @@ class EntryArray(Entry):
029efc
         code = TranslateList(code, translate)
029efc
 
029efc
         if codearrayfree:
029efc
-            code += map(lambda x: '    ' + x, codearrayfree)
029efc
+            code += ['    ' + x for x in codearrayfree]
029efc
             code += [
029efc
                 '  }' ]
029efc
 
029efc
@@ -1687,23 +1684,23 @@ class CommandLine:
029efc
 
029efc
         declare('... creating "%s"' % header_file)
029efc
         header_fp = open(header_file, 'w')
029efc
-        print >>header_fp, factory.HeaderPreamble(filename)
029efc
+        header_fp.write(factory.HeaderPreamble(filename))
029efc
 
029efc
         # Create forward declarations: allows other structs to reference
029efc
         # each other
029efc
         for entry in entities:
029efc
             entry.PrintForwardDeclaration(header_fp)
029efc
-        print >>header_fp, ''
029efc
+        header_fp.write('\n')
029efc
 
029efc
         for entry in entities:
029efc
             entry.PrintTags(header_fp)
029efc
             entry.PrintDeclaration(header_fp)
029efc
-        print >>header_fp, factory.HeaderPostamble(filename)
029efc
+        header_fp.write(factory.HeaderPostamble(filename))
029efc
         header_fp.close()
029efc
 
029efc
         declare('... creating "%s"' % impl_file)
029efc
         impl_fp = open(impl_file, 'w')
029efc
-        print >>impl_fp, factory.BodyPreamble(filename, header_file)
029efc
+        impl_fp.write(factory.BodyPreamble(filename, header_file))
029efc
         for entry in entities:
029efc
             entry.PrintCode(impl_fp)
029efc
         impl_fp.close()
029efc
@@ -1713,16 +1710,16 @@ if __name__ == '__main__':
029efc
         CommandLine(sys.argv).run()
029efc
         sys.exit(0)
029efc
 
029efc
-    except RpcGenError, e:
029efc
-        print >>sys.stderr, e
029efc
+    except RpcGenError as e:
029efc
+        sys.stderr.write(e)
029efc
         sys.exit(1)
029efc
 
029efc
-    except EnvironmentError, e:
029efc
+    except EnvironmentError as e:
029efc
         if e.filename and e.strerror:
029efc
-            print >>sys.stderr, "%s: %s" % (e.filename, e.strerror)
029efc
+            sys.stderr.write("%s: %s" % (e.filename, e.strerror))
029efc
             sys.exit(1)
029efc
         elif e.strerror:
029efc
-            print >> sys.stderr, e.strerror
029efc
+            sys.stderr.write(e.strerror)
029efc
             sys.exit(1)
029efc
         else:
029efc
             raise
029efc
diff --git a/test/check-dumpevents.py b/test/check-dumpevents.py
029efc
index 16fe9bc..3e1df30 100755
029efc
--- a/test/check-dumpevents.py
029efc
+++ b/test/check-dumpevents.py
029efc
@@ -1,4 +1,4 @@
029efc
-#!/usr/bin/python2
029efc
+#!/usr/bin/env python
029efc
 #
029efc
 # Post-process the output of test-dumpevents and check it for correctness.
029efc
 #
029efc
@@ -15,12 +15,12 @@ try:
029efc
     got_inserted_pos = text.index("Inserted events:\n")
029efc
     got_active_pos = text.index("Active events:\n")
029efc
 except ValueError:
029efc
-    print >>sys.stderr, "Missing expected dividing line in dumpevents output"
029efc
+    sys.stderr.write("Missing expected dividing line in dumpevents output")
029efc
     sys.exit(1)
029efc
 
029efc
 if not (expect_inserted_pos < expect_active_pos <
029efc
         got_inserted_pos < got_active_pos):
029efc
-    print >>sys.stderr, "Sections out of order in dumpevents output"
029efc
+    sys.stderr.write("Sections out of order in dumpevents output")
029efc
     sys.exit(1)
029efc
 
029efc
 now,T= text[1].split()
029efc
@@ -45,10 +45,10 @@ cleaned_inserted = set( pat.sub(replace_time, s) for s in got_inserted
029efc
                         if "Internal" not in s)
029efc
 
029efc
 if cleaned_inserted != want_inserted:
029efc
-    print >>sys.stderr, "Inserted event lists were not as expected!"
029efc
+    sys.stderr.write("Inserted event lists were not as expected!")
029efc
     sys.exit(1)
029efc
 
029efc
 if set(got_active) != set(want_active):
029efc
-    print >>sys.stderr, "Active event lists were not as expected!"
029efc
+    sys.stderr.write("Active event lists were not as expected!")
029efc
     sys.exit(1)
029efc
 
029efc
diff --git a/test/rpcgen_wrapper.sh b/test/rpcgen_wrapper.sh
029efc
index aaa0303..fe582d5 100755
029efc
--- a/test/rpcgen_wrapper.sh
029efc
+++ b/test/rpcgen_wrapper.sh
029efc
@@ -25,19 +25,10 @@ exit_failed() {
029efc
     echo "Could not generate regress.gen.\[ch\] using event_rpcgen.sh" >&2
029efc
     exit 1
029efc
 }
029efc
-
029efc
-if [ -x /usr/bin/python2 ] ; then
029efc
-  PYTHON2=/usr/bin/python2
029efc
-elif [ "x`which python2`" != x ] ; then
029efc
-  PYTHON2=python2
029efc
-else
029efc
-  PYTHON2=python
029efc
-fi
029efc
-
029efc
 srcdir=$1
029efc
 srcdir=${srcdir:-.}
029efc
 
029efc
-${PYTHON2} ${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc \
029efc
+${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc \
029efc
                test/regress.gen.h test/regress.gen.c
029efc
 
029efc
 case "$?" in
029efc
diff --git a/test/test.sh b/test/test.sh
029efc
index dd3d986..8a76529 100755
029efc
--- a/test/test.sh
029efc
+++ b/test/test.sh
029efc
@@ -82,8 +82,8 @@ run_tests () {
029efc
 		fi
029efc
 	done
029efc
 	announce_n " test-dumpevents: "
029efc
-	if python2 -c 'import sys; assert(sys.version_info >= (2, 4))' 2>/dev/null && test -f $TEST_SRC_DIR/check-dumpevents.py; then
029efc
-	    if $TEST_DIR/test-dumpevents | python2 $TEST_SRC_DIR/check-dumpevents.py >> "$TEST_OUTPUT_FILE" ;
029efc
+	if python -c 'import sys; assert(sys.version_info >= (2, 4))' 2>/dev/null && test -f $TEST_SRC_DIR/check-dumpevents.py; then
029efc
+	    if $TEST_DIR/test-dumpevents | $TEST_SRC_DIR/check-dumpevents.py >> "$TEST_OUTPUT_FILE" ;
029efc
 	    then
029efc
 	        announce OKAY ;
029efc
 	    else