Merge 'master' into telepathy-glib-0.24 (the branch has only fixes)

4 files changed, 32 insertions, 30 deletions

diff --git a/tools/glib-gtypes-generator.py b/tools/glib-gtypes-generator.py
index 1477bd37b..5d0bd8905 100644
--- a/tools/glib-gtypes-generator.py
+++ b/tools/glib-gtypes-generator.py
@@ -213,7 +213,7 @@ class GTypesGenerator(object):
         for mapping in mappings:
             self.do_mapping_header(mapping)
 
-        for sig in self.need_mappings:
+        for sig in sorted(self.need_mappings):
             self.h('GType %stype_dbus_hash_%s (void);\n\n' %
                               (self.prefix_, self.need_mappings[sig]))
             self.c('GType\n%stype_dbus_hash_%s (void)\n{\n' %
@@ -231,7 +231,7 @@ class GTypesGenerator(object):
         for struct in structs:
             self.do_struct_header(struct)
 
-        for sig in self.need_structs:
+        for sig in sorted(self.need_structs):
             self.h('GType %stype_dbus_struct_%s (void);\n\n' %
                               (self.prefix_, self.need_structs[sig]))
             self.c('GType\n%stype_dbus_struct_%s (void)\n{\n' %
@@ -247,7 +247,7 @@ class GTypesGenerator(object):
             self.c('  return t;\n')
             self.c('}\n\n')
 
-        for sig in self.need_struct_arrays:
+        for sig in sorted(self.need_struct_arrays):
             self.h('GType %stype_dbus_array_%s (void);\n\n' %
                               (self.prefix_, self.need_struct_arrays[sig]))
             self.c('GType\n%stype_dbus_array_%s (void)\n{\n' %
@@ -260,7 +260,7 @@ class GTypesGenerator(object):
             self.c('  return t;\n')
             self.c('}\n\n')
 
-        for sig in self.need_other_arrays:
+        for sig in sorted(self.need_other_arrays):
             self.h('GType %stype_dbus_array_of_%s (void);\n\n' %
                               (self.prefix_, self.need_other_arrays[sig]))
             self.c('GType\n%stype_dbus_array_of_%s (void)\n{\n' %
diff --git a/tools/make-release-mail.py b/tools/make-release-mail.py
index b03ebd256..33438382b 100644
--- a/tools/make-release-mail.py
+++ b/tools/make-release-mail.py
@@ -28,8 +28,8 @@ def extract_description(package, version, news_path):
                 break
 
         # Skip the ====== line, and the first blank line
-        lines.next()
-        lines.next()
+        next(lines)
+        next(lines)
 
         got_release_name = False
 
@@ -59,7 +59,7 @@ GIT_URL = 'http://cgit.freedesktop.org/telepathy'
 def main(package, version, news_path):
     release_name, details = extract_description(package, version, news_path)
 
-    print """
+    print("""
 %(release_name)s
 
 tarball: %(base_url)s/%(package)s/%(package)s-%(version)s.tar.gz
@@ -73,14 +73,14 @@ git: %(git_url)s/%(package)s
         'version': version,
         'release_name': release_name,
         'details': details,
-    }
+    })
 
 if __name__ == '__main__':
     try:
         package, version, news_path = sys.argv[1:]
 
         main(package, version, news_path)
-    except ValueError, e:
+    except ValueError as e:
         sys.stderr.write(
             'Usage: %s package-name package.version.number path/to/NEWS\n' %
             sys.argv[0])
diff --git a/tools/manager-file.py b/tools/manager-file.py
index e1b51a616..5e61c7558 100644
--- a/tools/manager-file.py
+++ b/tools/manager-file.py
@@ -25,6 +25,7 @@
 
 import re
 import sys
+import os
 
 _NOT_C_STR = re.compile(r'[^A-Za-z0-9_-]')
 
@@ -87,18 +88,18 @@ gflags = {
 
 def write_manager(f, manager, protos):
     # pointless backwards compat section
-    print >> f, '[ConnectionManager]'
-    print >> f, 'BusName=org.freedesktop.Telepathy.ConnectionManager.' + manager
-    print >> f, 'ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/' + manager
+    print('[ConnectionManager]', file=f)
+    print('BusName=org.freedesktop.Telepathy.ConnectionManager.' + manager, file=f)
+    print('ObjectPath=/org/freedesktop/Telepathy/ConnectionManager/' + manager, file=f)
 
     # protocols
-    for proto, params in protos.iteritems():
-        print >> f
-        print >> f, '[Protocol %s]' % proto
+    for proto, params in protos.items():
+        print(file=f)
+        print('[Protocol %s]' % proto, file=f)
 
         defaults = {}
 
-        for param, info in params.iteritems():
+        for param, info in params.items():
             dtype = info['dtype']
             flags = info.get('flags', '').split()
             struct_field = info.get('struct_field', param.replace('-', '_'))
@@ -115,15 +116,15 @@ def write_manager(f, manager, protos):
             else:
                 flags = ''
 
-            print >> f, 'param-%s=%s%s' % (param, desktop_string(dtype), flags)
+            print('param-%s=%s%s' % (param, desktop_string(dtype), flags), file=f)
 
-        for param, default in defaults.iteritems():
-            print >> f, 'default-%s=%s' % (param, default)
+        for param, default in defaults.items():
+            print('default-%s=%s' % (param, default), file=f)
 
 def write_c_params(f, manager, proto, struct, params):
-    print >> f, "static const TpCMParamSpec %s_%s_params[] = {" % (manager, proto)
+    print("static const TpCMParamSpec %s_%s_params[] = {" % (manager, proto), file=f)
 
-    for param, info in params.iteritems():
+    for param, info in params.items():
         dtype = info['dtype']
         flags = info.get('flags', '').split()
         struct_field = info.get('struct_field', param.replace('-', '_'))
@@ -146,7 +147,7 @@ def write_c_params(f, manager, proto, struct, params):
         else:
             struct_offset = 'G_STRUCT_OFFSET (%s, %s)' % (struct, struct_field)
 
-        print >> f, ('''  { %s, %s, %s,
+        print(('''  { %s, %s, %s,
     %s,
     %s, /* default */
     %s, /* struct offset */
@@ -154,14 +155,14 @@ def write_c_params(f, manager, proto, struct, params):
     %s, /* filter data */
     %s /* setter data */ },''' %
                 (c_string(param), c_string(dtype), gtypes[dtype], flags,
-                    default, struct_offset, filter, filter_data, setter_data))
+                    default, struct_offset, filter, filter_data, setter_data)), file=f)
 
-    print >> f, "  { NULL }"
-    print >> f, "};"
+    print("  { NULL }", file=f)
+    print("};", file=f)
 
 if __name__ == '__main__':
     environment = {}
-    execfile(sys.argv[1], environment)
+    exec(compile(open(sys.argv[1], "rb").read(), sys.argv[1], 'exec'), environment)
 
     filename = '%s/%s.manager' % (sys.argv[2], environment['MANAGER'])
     try:
diff --git a/tools/xincludator.py b/tools/xincludator.py
index f9ed49ce4..5f852bfd0 100644
--- a/tools/xincludator.py
+++ b/tools/xincludator.py
@@ -38,9 +38,10 @@ if __name__ == '__main__':
     xincludate(dom, argv[0])
 
     if sys.version_info[0] >= 3:
-        xml = dom.toxml(encoding=None)
+        xml = dom.toxml('utf-8')
+        stdout.buffer.write(xml)
+        stdout.buffer.write(b'\n')
     else:
         xml = dom.toxml()
-
-    stdout.write(xml)
-    stdout.write('\n')
+        stdout.write(xml)
+        stdout.write('\n')