Merge branch 'ebassi/python3-fixes' into 'master'

Python3 fixes for gtkdoc-depscan

See merge request GNOME/gtk-doc!63

1 files changed, 8 insertions, 7 deletions

diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in
index 9bfaf30..c43317c 100755
--- a/gtkdoc-depscan.in
+++ b/gtkdoc-depscan.in
@@ -4,6 +4,7 @@ from __future__ import print_function
 
 import gzip, os.path, re
 
+from functools import reduce
 from os import environ, popen, walk
 from optparse import OptionParser
 from sys import stderr
@@ -35,7 +36,7 @@ class Book(object):
                 lambda n: (os.path.getmtime(n), n),
                 filter(os.path.isfile, catalogs))
 
-            catalogs.sort()
+            catalogs = sorted(catalogs)
 
             if catalogs:
                 self.__catalog = catalogs[-1][1]
@@ -153,7 +154,7 @@ class Symbol(object):
         def __init__(self, text):
             match = re.match(r'^\w*\s*((?:\d+\.)*\d+)', text)
 
-            self.__numbers = map(int, match.group(1).split('.'))
+            self.__numbers = list(map(int, match.group(1).split('.')))
             self.__hash = reduce(lambda x, y: x * 1000 + y, reversed(self.__numbers))
             self.__text = text.strip()
 
@@ -214,9 +215,9 @@ class Symbol(object):
         if since: since = Symbol.VersionInfo(since)
 
         if name.count(' '):
-            print >>stderr, (
+            print(
                 'WARNING: Malformed symbol name: "%s" (type=%s) in %s.' % (
-                name, type, book.name))
+                name, type, book.name), file=stderr)
 
         return Symbol(book, name, type, link, deprecated, since)
 
@@ -322,7 +323,7 @@ if '__main__' == __name__:
             return name, Book(name, options.dirs, version)
 
         except IOError as e:
-            print >>stderr, 'WARNING: %s.' % e
+            print('WARNING: %s.' % e, file=stderr)
 
     def scan_source_file(name):
         contents = None
@@ -331,7 +332,7 @@ if '__main__' == __name__:
             contents = __comment_regex.sub('', file(name).read())
 
         except IOError as e:
-            print >>stderr, e
+            print(e, file=stderr)
 
         if contents:
             trace('scanning: %s', name)
@@ -368,7 +369,7 @@ if '__main__' == __name__:
 
     for book in books.values():
         requirements = book.find_requirements().items()
-        requirements.sort()
+        requirements = sorted(requirements)
 
         if requirements:
             for symbol in requirements[-1][1]: