From 2141978f4949aa886043521de9c771fba360ba33 Mon Sep 17 00:00:00 2001 From: Niveditha Rau Date: Thu, 29 Oct 2020 13:36:40 -0700 Subject: Fix for NameError: name 'reduce' is not defined --- gtkdoc-depscan.in | 1 + 1 file changed, 1 insertion(+) diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in index 9bfaf30..a41d0a6 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 -- cgit v1.2.1 From 0b8991a0c12c58092465d6c7259dba25efafa3a1 Mon Sep 17 00:00:00 2001 From: Niveditha Rau Date: Thu, 29 Oct 2020 13:38:20 -0700 Subject: Fix for AttributeError: 'map' object has no attribute 'sort' --- gtkdoc-depscan.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in index a41d0a6..3d586db 100755 --- a/gtkdoc-depscan.in +++ b/gtkdoc-depscan.in @@ -36,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] @@ -154,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() @@ -369,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]: -- cgit v1.2.1 From 049d0c2e73a08cf43d69eae6873633dbff48abd1 Mon Sep 17 00:00:00 2001 From: Niveditha Rau Date: Thu, 29 Oct 2020 13:43:24 -0700 Subject: Fix for TypeError: unsupported operand type(s) for >>: 'builtin_function_or_method' and '_io.TextIOWrapper' --- gtkdoc-depscan.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gtkdoc-depscan.in b/gtkdoc-depscan.in index 3d586db..c43317c 100755 --- a/gtkdoc-depscan.in +++ b/gtkdoc-depscan.in @@ -215,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) @@ -323,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 @@ -332,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) -- cgit v1.2.1