Skip to content

Commit 1960ad8

Browse files
committed
Python 3 Compatiable Yum
1 parent 2c2a766 commit 1960ad8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1963
-1978
lines changed

bin/yum-updatesd.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
try:
2121
import yumupd
2222
yumupd.main(options)
23-
except KeyboardInterrupt, e:
24-
print >> sys.stderr, "\n\nExiting on user cancel."
23+
except KeyboardInterrupt as e:
24+
print("\n\nExiting on user cancel.", file=sys.stderr)
2525
sys.exit(1)

bin/yum.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
try:
44
import yum
55
except ImportError:
6-
print >> sys.stderr, """\
6+
print("""\
77
There was a problem importing one of the Python modules
88
required to run yum. The error leading to this problem was:
99
@@ -20,13 +20,13 @@
2020
the yum faq at:
2121
http://yum.baseurl.org/wiki/Faq
2222
23-
""" % (sys.exc_value, sys.version)
23+
""" % (sys.exc_info()[1], sys.version), file=sys.stderr)
2424
sys.exit(1)
2525

2626
sys.path.insert(0, '/usr/share/yum-cli')
2727
try:
2828
import yummain
2929
yummain.user_main(sys.argv[1:], exit_code=True)
30-
except KeyboardInterrupt, e:
31-
print >> sys.stderr, "\n\nExiting on user cancel."
30+
except KeyboardInterrupt as e:
31+
print("\n\nExiting on user cancel.", file=sys.stderr)
3232
sys.exit(1)

callback.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def _makeHandle(self, hdr):
7272

7373
def _localprint(self, msg):
7474
if self.output:
75-
print msg
75+
print(msg)
7676

7777
def _makefmt(self, percent, progress = True):
7878
l = len(str(self.total_actions))
@@ -174,7 +174,7 @@ def callback(self, what, bytes, total, h, user):
174174
if total == 0:
175175
percent = 0
176176
else:
177-
percent = (bytes*100L)/total
177+
percent = (bytes*100)/total
178178
if self.output and sys.stdout.isatty():
179179
fmt = self._makefmt(percent)
180180
msg = fmt % (_('Repackage'), h)
@@ -190,16 +190,16 @@ def callback(self, what, bytes, total, h, user):
190190
if total == 0:
191191
percent = 0
192192
else:
193-
percent = (bytes*100L)/total
193+
percent = (bytes*100)/total
194194
pkgtup = self._dopkgtup(hdr)
195195

196196
txmbrs = self.tsInfo.getMembers(pkgtup=pkgtup)
197197
for txmbr in txmbrs:
198198
try:
199199
process = self.myprocess[txmbr.output_state]
200-
except KeyError, e:
201-
print _("Error: invalid output state: %s for %s") % \
202-
(txmbr.output_state, hdr['name'])
200+
except KeyError as e:
201+
print(_("Error: invalid output state: %s for %s") % \
202+
(txmbr.output_state, hdr['name']))
203203
else:
204204
if self.output and (sys.stdout.isatty() or bytes == total):
205205
fmt = self._makefmt(percent)
@@ -209,7 +209,7 @@ def callback(self, what, bytes, total, h, user):
209209
sys.stdout.flush()
210210
self.lastmsg = msg
211211
if bytes == total:
212-
print " "
212+
print(" ")
213213

214214

215215
elif what == rpm.RPMCALLBACK_UNINST_START:

0 commit comments

Comments
 (0)