Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoo-bumpchecker:master commit in: /, modules/
Date: Mon, 20 Mar 2017 22:17:48
Message-Id: 1490048233.7e556e101024f201267b16e5120e9b76e62cdec9.leio@gentoo
1 commit: 7e556e101024f201267b16e5120e9b76e62cdec9
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 20 22:02:14 2017 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 20 22:17:13 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/gentoo-bumpchecker.git/commit/?id=7e556e10
7
8 gnome: Quick port to python3
9
10 Just what's necessary to get it going on python3 (just print changes and some bytes vs
11 str error) for now.
12
13 gnome-bumpchecker.py | 2 +-
14 modules/ftp_module.py | 10 +++++-----
15 modules/gnome_module.py | 20 ++++++++++----------
16 modules/gnome_output.py | 4 ++--
17 modules/package_module.py | 10 +++++-----
18 modules/portage_module.py | 10 +++++-----
19 6 files changed, 28 insertions(+), 28 deletions(-)
20
21 diff --git a/gnome-bumpchecker.py b/gnome-bumpchecker.py
22 index c9656e9..c9f6e55 100755
23 --- a/gnome-bumpchecker.py
24 +++ b/gnome-bumpchecker.py
25 @@ -1,4 +1,4 @@
26 -#! /usr/bin/python2
27 +#!/usr/bin/env python3
28 # Copyright John N. Laliberte <allanonjl@g.o>
29 # Copyright Daniel Gryniewicz <dang@g.o>
30 # LICENSE - GPL2
31
32 diff --git a/modules/ftp_module.py b/modules/ftp_module.py
33 index 837624c..f3c5ea9 100644
34 --- a/modules/ftp_module.py
35 +++ b/modules/ftp_module.py
36 @@ -14,16 +14,16 @@ DEBUG = False
37 class FTPWalker:
38 def __init__(self, site, user, passwd):
39 self.ftp = ftplib.FTP(site, user, passwd)
40 - if DEBUG: print "logged into ftp"
41 + if DEBUG: print("logged into ftp")
42
43 def cd(self, path):
44 try:
45 self.ftp.cwd(path)
46 #sys.stdout.write(".")
47 - if DEBUG: print "successfully changed path to " + path
48 + if DEBUG: print("successfully changed path to " + path)
49 return True
50 except:
51 - print "Directory does not exist " + path
52 + print("Directory does not exist " + path)
53 return False
54
55 def pwd(self):
56 @@ -46,7 +46,7 @@ class FTPWalker:
57 name, symbolic = name.split("->")
58 name = name.strip()
59 symbolic = symbolic.strip()
60 - if DEBUG: print "Name of the file is: " + name
61 + if DEBUG: print("Name of the file is: " + name)
62
63 return FileInformation(name, isdir)
64
65 @@ -88,7 +88,7 @@ def find_files(walker, dir, excluded_names, excluded_suffixes):
66
67 for fileinfo in listSiteGen(walker, dir, excluded_names):
68 #if not excluded( excluded_suffixes, fileinfo):
69 - if DEBUG: print "Appending: " + str(fileinfo.name)
70 + if DEBUG: print("Appending: " + str(fileinfo.name))
71 file_listing.append(fileinfo.name)
72
73 return file_listing
74
75 diff --git a/modules/gnome_module.py b/modules/gnome_module.py
76 index 06fe6d8..afba235 100644
77 --- a/modules/gnome_module.py
78 +++ b/modules/gnome_module.py
79 @@ -44,8 +44,8 @@ class GNOME:
80 raise ValueError("Couldn't open %s" % url)
81
82 ret = []
83 - for line in data.iter_lines():
84 - components = str.strip(line).split(':')
85 + for line in data.text.splitlines():
86 + components = line.strip().split(':')
87 # Skip invalid lines
88 if len(components) != 4 or len(components[2]) == 0:
89 continue
90 @@ -56,7 +56,7 @@ class GNOME:
91 if (pkg.name and pkg.version):
92 ret.append(pkg)
93 else:
94 - print "Warning: Ignoring package %s because parsing of its name or version string '%s' failed" % (components[1], components[2])
95 + print("Warning: Ignoring package %s because parsing of its name or version string '%s' failed" % (components[1], components[2]))
96 return ret
97
98 def generate_data_individual(self, release_packages):
99 @@ -114,7 +114,7 @@ def compare_packages(release_packages, latest_packages, packages_in_portage):
100 release_package = package
101 latest_package = portage_module.findpackage(package.name, latest_packages)
102 if latest_package == None:
103 - print "Warning: latest packages set does not have an entry for %s, using release set version %s." % (package.name, package.version)
104 + print("Warning: latest packages set does not have an entry for %s, using release set version %s." % (package.name, package.version))
105 latest_package = package
106 portage_package = portage_module.findpackage(package.name, packages_in_portage)
107
108 @@ -139,15 +139,15 @@ def compare_packages(release_packages, latest_packages, packages_in_portage):
109
110 # FIXME: Reports release version as latest version to not have to deal with this right now
111 if latest_package == None:
112 - print "No latest version known for %s, FIXME!" % release_package.name
113 + print("No latest version known for %s, FIXME!" % release_package.name)
114 latest_package = release_package
115
116 if DEBUG:
117 - print "package: " + str(release_package.name) + \
118 - " | pp: " + str(portage_package.version) + \
119 - " | rp: " + str(release_package.version) + \
120 - " | lp: " + str(latest_package.version) + \
121 - " | status: " + str(status)
122 + print("package: " + str(release_package.name) +
123 + " | pp: " + str(portage_package.version) +
124 + " | rp: " + str(release_package.version) +
125 + " | lp: " + str(latest_package.version) +
126 + " | status: " + str(status))
127
128 status_packages.append(package_module.PackageStatus(release_package.name, str(portage_package.version), str(release_package.version), str(latest_package.version), status))
129
130
131 diff --git a/modules/gnome_output.py b/modules/gnome_output.py
132 index f127e6a..19b6da0 100644
133 --- a/modules/gnome_output.py
134 +++ b/modules/gnome_output.py
135 @@ -101,7 +101,7 @@ class Output:
136
137 self.write_file(lines, clioptions_module.Options().get_arguments().output)
138
139 - print "Generated html output."
140 + print("Generated html output.")
141
142 def generate_keywords(self):
143 lines = []
144 @@ -115,7 +115,7 @@ class Output:
145
146 self.write_file(lines, "package.keywords")
147
148 - print "Generate package.keywords output."
149 + print("Generate package.keywords output.")
150
151 def write_file(self, lines, filename):
152 file = open(filename, "w")
153
154 diff --git a/modules/package_module.py b/modules/package_module.py
155 index b663c28..e10e835 100644
156 --- a/modules/package_module.py
157 +++ b/modules/package_module.py
158 @@ -75,16 +75,16 @@ class Package(object):
159 self.raw_name = self.name
160 self.major_minor = self.parse_mm(self.version)
161 # else:
162 -# print "Error, " + raw_string + " is not a valid package!"
163 +# print("Error, " + raw_string + " is not a valid package!")
164
165 def parse_mm(self, version):
166 return '.'.join(version.split('.')[0:2])
167
168 def print_info(self):
169 - print "Name: " + str(self.name)
170 - print "Version: " + str(self.package_version)
171 - print "Name+Version: " + str(self.name_plus_version)
172 - print "Raw: " + str(self.raw_string)
173 + print("Name: " + str(self.name))
174 + print("Version: " + str(self.package_version))
175 + print("Name+Version: " + str(self.name_plus_version))
176 + print("Raw: " + str(self.raw_string))
177
178 def __repr__(self):
179 return self.name_plus_version
180
181 diff --git a/modules/portage_module.py b/modules/portage_module.py
182 index 7aac61f..47e37c2 100644
183 --- a/modules/portage_module.py
184 +++ b/modules/portage_module.py
185 @@ -115,8 +115,8 @@ def find_packages_in_tree(package_list, portdir=None, all_overlays=False, overla
186 return portage_versions
187
188 def tests():
189 - print split_package_into_parts("media-gfx/gimp-3.5.0-r3")
190 - print split_package_into_parts("media-gfx/gimp-3.5")
191 - print find_category("gimp")
192 - print find_category("gimp-2.0")
193 - print best_version(["gimp-2.0", "gimp-2.0-r1", "gimp-3.0"])
194 + print(split_package_into_parts("media-gfx/gimp-3.5.0-r3"))
195 + print(split_package_into_parts("media-gfx/gimp-3.5"))
196 + print(find_category("gimp"))
197 + print(find_category("gimp-2.0"))
198 + print(best_version(["gimp-2.0", "gimp-2.0-r1", "gimp-3.0"]))