<86>Apr 20 00:26:09 userdel[18282]: delete user 'rooter' <86>Apr 20 00:26:09 userdel[18282]: removed group 'rooter' owned by 'rooter' <86>Apr 20 00:26:09 userdel[18282]: removed shadow group 'rooter' owned by 'rooter' <86>Apr 20 00:26:09 groupadd[18296]: group added to /etc/group: name=rooter, GID=597 <86>Apr 20 00:26:09 groupadd[18296]: group added to /etc/gshadow: name=rooter <86>Apr 20 00:26:09 groupadd[18296]: new group: name=rooter, GID=597 <86>Apr 20 00:26:09 useradd[18308]: new user: name=rooter, UID=597, GID=597, home=/root, shell=/bin/bash <86>Apr 20 00:26:10 userdel[18341]: delete user 'builder' <86>Apr 20 00:26:10 userdel[18341]: removed group 'builder' owned by 'builder' <86>Apr 20 00:26:10 userdel[18341]: removed shadow group 'builder' owned by 'builder' <86>Apr 20 00:26:10 groupadd[18355]: group added to /etc/group: name=builder, GID=598 <86>Apr 20 00:26:10 groupadd[18355]: group added to /etc/gshadow: name=builder <86>Apr 20 00:26:10 groupadd[18355]: new group: name=builder, GID=598 <86>Apr 20 00:26:10 useradd[18369]: new user: name=builder, UID=598, GID=598, home=/usr/src, shell=/bin/bash <13>Apr 20 00:26:13 rpmi: libgdbm-1.8.3-alt10 1454943334 installed <13>Apr 20 00:26:13 rpmi: libexpat-2.2.4-alt1 1503305345 installed <13>Apr 20 00:26:13 rpmi: libp11-kit-0.23.15-alt1 sisyphus+226408.100.2.1 1554288204 installed <13>Apr 20 00:26:13 rpmi: libtasn1-4.13-alt2 1521133850 installed <13>Apr 20 00:26:13 rpmi: rpm-macros-alternatives-0.5.1-alt1 sisyphus+226946.100.1.1 1554830426 installed <13>Apr 20 00:26:13 rpmi: alternatives-0.5.1-alt1 sisyphus+226946.100.1.1 1554830426 installed <13>Apr 20 00:26:13 rpmi: ca-certificates-2019.03.31-alt1 sisyphus+226302.100.1.1 1554055265 installed <13>Apr 20 00:26:13 rpmi: ca-trust-0.1.1-alt2 1515595785 installed <13>Apr 20 00:26:13 rpmi: p11-kit-trust-0.23.15-alt1 sisyphus+226408.100.2.1 1554288204 installed <13>Apr 20 00:26:13 rpmi: libcrypto1.1-1.1.1b-alt1 sisyphus+225327.200.2.1 1553099317 installed <13>Apr 20 00:26:13 rpmi: libssl1.1-1.1.1b-alt1 sisyphus+225327.200.2.1 1553099317 installed <13>Apr 20 00:26:13 rpmi: python3-3.7.3-alt1 sisyphus+225625.574.90.1 1555274251 installed <13>Apr 20 00:26:13 rpmi: libpython3-3.7.3-alt1 sisyphus+225625.574.90.1 1555274251 installed <13>Apr 20 00:26:15 rpmi: python3-base-3.7.3-alt1 sisyphus+225625.574.90.1 1555274251 installed <13>Apr 20 00:26:15 rpmi: tests-for-installed-python3-pkgs-0.1.13.1-alt2 1535450458 installed <13>Apr 20 00:26:15 rpmi: rpm-build-python3-0.1.13.1-alt2 1535450458 installed <13>Apr 20 00:26:19 rpmi: libidn2-2.1.1-alt1 sisyphus+221274.100.1.2 1549951289 installed <13>Apr 20 00:26:19 rpmi: libtinfo-devel-6.1.20180407-alt2 sisyphus+222164.200.1.1 1550686226 installed <13>Apr 20 00:26:19 rpmi: libncurses-devel-6.1.20180407-alt2 sisyphus+222164.200.1.1 1550686226 installed <13>Apr 20 00:26:19 rpmi: publicsuffix-list-dafsa-20190329-alt1 sisyphus+226347.100.1.2 1554127434 installed <13>Apr 20 00:26:19 rpmi: libpsl-0.21.0-alt1 sisyphus+227314.100.1.2 1555618423 installed <13>Apr 20 00:26:19 rpmi: libnghttp2-1.34.0-alt1 sisyphus+222625.100.1.1 1550947259 installed <13>Apr 20 00:26:19 rpmi: libverto-0.3.0-alt1_7 sisyphus+225932.100.1.1 1553994919 installed <13>Apr 20 00:26:19 rpmi: libkeyutils-1.6-alt2 sisyphus+226520.100.2.1 1554512089 installed <13>Apr 20 00:26:19 rpmi: libcom_err-1.44.6-alt1 sisyphus+224154.100.1.1 1552091678 installed <86>Apr 20 00:26:19 groupadd[496]: group added to /etc/group: name=_keytab, GID=499 <86>Apr 20 00:26:19 groupadd[496]: group added to /etc/gshadow: name=_keytab <86>Apr 20 00:26:19 groupadd[496]: new group: name=_keytab, GID=499 <13>Apr 20 00:26:19 rpmi: libkrb5-1.16.3-alt1 sisyphus+223678.100.1.1 1551746516 installed <86>Apr 20 00:26:19 groupadd[824]: group added to /etc/group: name=sasl, GID=498 <86>Apr 20 00:26:19 groupadd[824]: group added to /etc/gshadow: name=sasl <86>Apr 20 00:26:19 groupadd[824]: new group: name=sasl, GID=498 <13>Apr 20 00:26:19 rpmi: libsasl2-3-2.1.27-alt1 sisyphus+223971.100.1.1 1551928460 installed <13>Apr 20 00:26:19 rpmi: libldap-2.4.46-alt1.1 sisyphus+219907.4400.1.1 1548349979 installed <13>Apr 20 00:26:19 rpmi: libtirpc-1.0.3-alt1 1532008017 installed <13>Apr 20 00:26:19 rpmi: libnsl2-1.1.0-alt1_1 1511548749 installed <13>Apr 20 00:26:19 rpmi: python-modules-encodings-2.7.16-alt1 sisyphus+226365.200.2.1 1554143304 installed <13>Apr 20 00:26:19 rpmi: python-modules-compiler-2.7.16-alt1 sisyphus+226365.200.2.1 1554143304 installed <13>Apr 20 00:26:19 rpmi: python-modules-email-2.7.16-alt1 sisyphus+226365.200.2.1 1554143304 installed <13>Apr 20 00:26:19 rpmi: python-modules-unittest-2.7.16-alt1 sisyphus+226365.200.2.1 1554143304 installed <13>Apr 20 00:26:20 rpmi: python-modules-2.7.16-alt1 sisyphus+226365.200.2.1 1554143304 installed <13>Apr 20 00:26:20 rpmi: python-modules-nis-2.7.16-alt1 sisyphus+226365.200.2.1 1554143304 installed <13>Apr 20 00:26:20 rpmi: python-modules-ctypes-2.7.16-alt1 sisyphus+226365.200.2.1 1554143304 installed <13>Apr 20 00:26:20 rpmi: python-modules-multiprocessing-2.7.16-alt1 sisyphus+226365.200.2.1 1554143304 installed <13>Apr 20 00:26:20 rpmi: python-modules-logging-2.7.16-alt1 sisyphus+226365.200.2.1 1554143304 installed <13>Apr 20 00:26:20 rpmi: libbrotlicommon-1.0.7-alt1 sisyphus+226738.100.2.1 1554554568 installed <13>Apr 20 00:26:20 rpmi: libbrotlidec-1.0.7-alt1 sisyphus+226738.100.2.1 1554554568 installed <13>Apr 20 00:26:20 rpmi: libcurl-7.64.1-alt1 sisyphus+225825.100.1.1 1553777011 installed <13>Apr 20 00:26:20 rpmi: python3-module-pycurl-7.43.0.2-alt1 sisyphus+225625.13700.91.1 1555290736 installed <13>Apr 20 00:26:20 rpmi: python-tools-2to3-2.7.16-alt1 sisyphus+226365.200.2.1 1554143304 installed <13>Apr 20 00:26:20 rpmi: python3-dev-3.7.3-alt1 sisyphus+225625.574.90.1 1555274251 installed <13>Apr 20 00:26:20 rpmi: python3-module-six-1.12.0-alt1 sisyphus+219665.100.2.1 1548148570 installed Building target platforms: i586 Building for target i586 Wrote: /usr/src/in/nosrpm/python3-module-urlgrabber-3.10.1-alt1.git20140204.2.nosrc.rpm <13>Apr 20 00:26:23 rpmi: python3-module-pkg_resources-1:40.8.0-alt1 sisyphus+221229.100.2.1 1550559950 installed <13>Apr 20 00:26:24 rpmi: python3-module-setuptools-1:40.8.0-alt1 sisyphus+221229.100.2.1 1550559950 installed Installing python3-module-urlgrabber-3.10.1-alt1.git20140204.2.src.rpm Building target platforms: i586 Building for target i586 Executing(%prep): /bin/sh -e /usr/src/tmp/rpm-tmp.26077 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + rm -rf urlgrabber-3.10.1 + echo 'Source #0 (urlgrabber-3.10.1.tar):' Source #0 (urlgrabber-3.10.1.tar): + /bin/tar -xf /usr/src/RPM/SOURCES/urlgrabber-3.10.1.tar + cd urlgrabber-3.10.1 + /bin/chmod -c -Rf u+rwX,go-w . + find -type f -name '*.py' -exec 2to3 -w -n '{}' + RefactoringTool: Skipping optional fixer: buffer RefactoringTool: Skipping optional fixer: idioms RefactoringTool: Skipping optional fixer: set_literal RefactoringTool: Skipping optional fixer: ws_comma RefactoringTool: Refactored ./urlgrabber/progress.py RefactoringTool: No changes to ./urlgrabber/mirror.py RefactoringTool: Refactored ./urlgrabber/grabber.py --- ./urlgrabber/progress.py (original) +++ ./urlgrabber/progress.py (refactored) @@ -807,7 +807,7 @@ tm.end(size) def _mtst(datas, *args): - print('-' * 79) + print(('-' * 79)) tm = TextMultiFileMeter(threaded=False) dl_sizes = {} --- ./urlgrabber/grabber.py (original) +++ ./urlgrabber/grabber.py (refactored) @@ -640,7 +640,7 @@ if six.PY3: return obj # stolen from yum.i18n - if isinstance(obj, unicode): + if isinstance(obj, str): obj = obj.encode('utf-8', errors) return obj @@ -649,7 +649,7 @@ return str(e) except UnicodeEncodeError: # always use byte strings - return unicode(e).encode('utf8') + return str(e).encode('utf8') ######################################################################## # END UTILITY FUNCTIONS @@ -1988,7 +1988,7 @@ if v is False: return 'False' if type(v) in six.integer_types + (float,): return str(v) - if not six.PY3 and type(v) == unicode: + if not six.PY3 and type(v) == str: v = v.encode('UTF8') if type(v) == str: def quoter(c): return _quoter_map.get(c, c) @@ -2178,10 +2178,10 @@ return ret def abort(self): - for dl in self.running.values(): + for dl in list(self.running.values()): self.epoll.unregister(dl.stdout) dl.abort() - for dl in self.cache.values(): + for dl in list(self.cache.values()): dl.abort() @@ -2475,8 +2475,8 @@ def _main_test(): try: url, filename = sys.argv[1:3] except ValueError: - print('usage:', sys.argv[0], \ - ' [copy_local=0|1] [close_connection=0|1]') + print(('usage:', sys.argv[0], \ + ' [copy_local=0|1] [close_connection=0|1]')) sys.exit() kwargs = {} @@ -2486,8 +2486,8 @@ set_throttle(1.0) set_bandwidth(32 * 1024) - print("throttle: %s, throttle bandwidth: %s B/s" % (default_grabber.throttle, - default_grabber.bandwidth)) + print(("throttle: %s, throttle bandwidth: %s B/s" % (default_grabber.throttle, + default_grabber.bandwidth))) try: from .progress import text_progress_meter except ImportError: pass @@ -2495,14 +2495,14 @@ try: name = urlgrab(*(url, filename), **kwargs) except URLGrabError as e: print(e) - else: print('LOCAL FILE:', name) + else: print(('LOCAL FILE:', name)) def _retry_test(): try: url, filename = sys.argv[1:3] except ValueError: - print('usage:', sys.argv[0], \ - ' [copy_local=0|1] [close_connection=0|1]') + print(('usage:', sys.argv[0], \ + ' [copy_local=0|1] [close_connection=0|1]')) sys.exit() kwargs = {} @@ -2515,7 +2515,7 @@ else: kwargs['progress_obj'] = text_progress_meter() def cfunc(filename, hello, there='foo'): - print(hello, there) + print((hello, there)) import random rnum = random.random() if rnum < .5: @@ -2530,12 +2530,12 @@ kwargs['checkfunc'] = (cfunc, ('hello',), {'there':'there'}) try: name = retrygrab(*(url, filename), **kwargs) except URLGrabError as e: print(e) - else: print('LOCAL FILE:', name) + else: print(('LOCAL FILE:', name)) def _file_object_test(filename=None): if filename is None: filename = __file__ - print('using file "%s" for comparisons' % filename) + print(('using file "%s" for comparisons' % filename)) fo = open(filename) s_input = fo.read() fo.close() @@ -2547,7 +2547,7 @@ fo_input = StringIO(s_input) fo_output = StringIO() wrapper = PyCurlFileObject(fo_input, None, 0) - print('testing %-30s ' % testfunc.__name__, testfunc(wrapper, fo_output)) + print(('testing %-30s ' % testfunc.__name__, testfunc(wrapper, fo_output))) s_output = fo_oRefactoringTool: Refactored ./urlgrabber/byterange.py RefactoringTool: No changes to ./urlgrabber/__init__.py RefactoringTool: Refactored ./test/threading/batchgrabber.py RefactoringTool: Refactored ./test/test_mirror.py utput.getvalue() if s_output == s_input: print('passed') else: print('FAILED') --- ./urlgrabber/byterange.py (original) +++ ./urlgrabber/byterange.py (refactored) @@ -261,7 +261,7 @@ from urllib.request import splitattr from urllib.response import addinfourl else: - from urllib import splitattr + from urllib.parse import splitattr from urllib import addinfourl --- ./test/threading/batchgrabber.py (original) +++ ./test/threading/batchgrabber.py (refactored) @@ -31,7 +31,7 @@ import os.path, sys if __name__ == '__main__': - print os.path.dirname(sys.argv[0]) + print(os.path.dirname(sys.argv[0])) sys.path.insert(0, (os.path.dirname(sys.argv[0]) or '.') + '/../..') from threading import Thread, Semaphore @@ -61,12 +61,12 @@ del self.queue[0] thread = Worker(self, url, filename, kwargs) self.threads.append(thread) - if DEBUG: print "starting worker: " + url + if DEBUG: print("starting worker: " + url) thread.start() else: for t in self.threads: if not t.isAlive(): - if DEBUG: print "cleaning up worker: " + t.url + if DEBUG: print("cleaning up worker: " + t.url) self.threads.remove(t) #if len(self.threads) == self.maxthreads: # sleep(0.2) @@ -81,15 +81,15 @@ self.kwargs = kwargs def run(self): - if DEBUG: print "worker thread started." + if DEBUG: print("worker thread started.") grabber = self.parent.grabber progress_obj = grabber.opts.progress_obj if isinstance(progress_obj, MultiFileMeter): self.kwargs['progress_obj'] = progress_obj.newMeter() try: rslt = self.parent.grabber.urlgrab(self.url, self.filename, **self.kwargs) - except URLGrabError, e: - print '%s, %s' % (e, self.url) + except URLGrabError as e: + print('%s, %s' % (e, self.url)) def main(): progress_obj = None @@ -98,13 +98,13 @@ g = BatchURLGrabber(keepalive=1, progress_obj=progress_obj) for arg in sys.argv[1:]: g.urlgrab(arg) - if DEBUG: print "before batchgrab" + if DEBUG: print("before batchgrab") try: g.batchgrab() except KeyboardInterrupt: sys.exit(1) - if DEBUG: print "after batchgrab" + if DEBUG: print("after batchgrab") if __name__ == '__main__': main() --- ./test/test_mirror.py (original) +++ ./test/test_mirror.py (refactored) @@ -119,8 +119,8 @@ tl.append(str(cb_obj.exception)) self.mg.failure_callback = failure_callback, (tricky_list, ), {} data = self.mg.urlread('reference') - self.assert_(data == reference_data) - self.assertEquals(tricky_list[0][:25], + self.assertTrue(data == reference_data) + self.assertEqual(tricky_list[0][:25], '[Errno 14] HTTP Error 403') def test_callback_reraise(self): @@ -209,8 +209,8 @@ 'MAIN mirrors: [a b c d e f] 2', 'MIRROR: trying somefile -> c/somefile'] - self.assertEquals(self.g.calls, expected_calls) - self.assertEquals(urlgrabber.mirror.DEBUG.logs, expected_logs) + self.assertEqual(self.g.calls, expected_calls) + self.assertEqual(urlgrabber.mirror.DEBUG.logs, expected_logs) def test_instance_action(self): 'test the effects of passed-in default_action' @@ -229,8 +229,8 @@ 'MAIN mirrors: [c d e f] 0', 'MIRROR: trying somefile -> c/somefile'] - self.assertEquals(self.g.calls, expected_calls) - self.assertEquals(urlgrabber.mirror.DEBUG.logs, expected_logs) + self.assertEqual(self.g.calls, expected_calls) + self.assertEqual(urlgrabber.mirror.DEBUG.logs, expected_logs) def test_method_action(self): 'test the effects of method-level default_action' @@ -248,8 +248,8 @@ 'MAIN mirrors: [c d e f] 0', 'MIRROR: trying somefile -> c/somefile'] - self.assertEquals(self.g.calls, expecRefactoringTool: Refactored ./test/test_grabber.py ted_calls) - self.assertEquals(urlgrabber.mirror.DEBUG.logs, expected_logs) + self.assertEqual(self.g.calls, expected_calls) + self.assertEqual(urlgrabber.mirror.DEBUG.logs, expected_logs) def callback(self, e): return {'fail': 1} @@ -266,8 +266,8 @@ 'GR mirrors: [b c d e f] 0', 'MAIN mirrors: [a b c d e f] 1'] - self.assertEquals(self.g.calls, expected_calls) - self.assertEquals(urlgrabber.mirror.DEBUG.logs, expected_logs) + self.assertEqual(self.g.calls, expected_calls) + self.assertEqual(urlgrabber.mirror.DEBUG.logs, expected_logs) from six.moves import _thread as thread import socket @@ -319,14 +319,14 @@ # single self.assertRaises(URLGrabError, self.mg.urlgrab, 'foo') - self.assertEquals(self.code, 503); del self.code + self.assertEqual(self.code, 503); del self.code # multi err = [] self.mg.urlgrab('foo', async = True, failfunc = err.append) urlgrabber.grabber.parallel_wait() - self.assertEquals([e.exception.errno for e in err], [256]) - self.assertEquals(self.code, 503); del self.code + self.assertEqual([e.exception.errno for e in err], [256]) + self.assertEqual(self.code, 503); del self.code def test_range(self): 'test client-side processing of HTTP ranges' @@ -336,10 +336,10 @@ # no range specified data = self.mg.urlread('foo') - self.assertEquals(data, 'ABCDEF') + self.assertEqual(data, 'ABCDEF') data = self.mg.urlread('foo', range = (3, 5)) - self.assertEquals(data, 'DE') + self.assertEqual(data, 'DE') def suite(): tl = TestLoader() --- ./test/test_grabber.py (original) +++ ./test/test_grabber.py (refactored) @@ -47,7 +47,7 @@ fo.write(reference_data.encode('utf-8')) fo.close() - self.fo_input = StringIO(unicode(reference_data) if not six.PY3 else reference_data) + self.fo_input = StringIO(str(reference_data) if not six.PY3 else reference_data) self.fo_output = StringIO() (url, parts) = grabber.default_grabber.opts.urlparser.parse( self.filename, grabber.default_grabber.opts) @@ -62,7 +62,7 @@ "PYCurlFileObject .read() method" s = self.wrapper.read() self.fo_output.write(s) - self.assert_(reference_data == self.fo_output.getvalue()) + self.assertTrue(reference_data == self.fo_output.getvalue()) def test_readline(self): "PyCurlFileObject .readline() method" @@ -70,13 +70,13 @@ s = self.wrapper.readline() self.fo_output.write(s) if not s: break - self.assert_(reference_data == self.fo_output.getvalue()) + self.assertTrue(reference_data == self.fo_output.getvalue()) def test_readlines(self): "PyCurlFileObject .readlines() method" li = self.wrapper.readlines() self.fo_output.write(''.join(li)) - self.assert_(reference_data == self.fo_output.getvalue()) + self.assertTrue(reference_data == self.fo_output.getvalue()) def test_smallread(self): "PyCurlFileObject .read(N) with small N" @@ -84,7 +84,7 @@ s = self.wrapper.read(23) self.fo_output.write(s) if not s: break - self.assert_(reference_data == self.fo_output.getvalue()) + self.assertTrue(reference_data == self.fo_output.getvalue()) class HTTPTests(TestCase): def test_reference_file(self): @@ -96,7 +96,7 @@ contents = fo.read() fo.close() - self.assert_(contents == reference_data) + self.assertTrue(contents == reference_data) def test_post(self): "do an HTTP post" @@ -163,38 +163,38 @@ proxies={'http' : 'http://www.proxy.com:9090'}, opener=opener ) opts = g.opts - self.assertEquals( opts.progress_obj, self.meter ) - self.assertEquals( opts.throttle, 0.9 ) - self.assertEquals( opts.bandwidth, 20 ) - self.assertEquals( opts.retry, 20 ) - self.assertEquals( opts.retrycodes, [5,6,7] ) - self.assertEquals( opts.copy_local, 1 ) - self.assertEquals( opts.close_connection, 1 ) - self.assertEquals( opts.user_agent, 'test ua/1.0' ) - self.assertEquals( opts.proxies, {'http' : 'http://www.proxy.com:9090'} ) - self.assertEquals( opts.opener, opener ) + self.assertEqual( opts.progress_obj, self.meter ) + self.assertEqual( opts.throttle, 0.9 ) + self.assertEqual( opts.bandwidth, 20 ) + self.assertEqual( opts.retry, 20 ) + self.assertEqual( opts.retrycodes, [5,6,7] ) + self.assertEqual( opts.copy_local, 1 ) + self.assertEqual( opts.close_connection, 1 ) + self.assertEqual( opts.user_agent, 'test ua/1.0' ) + self.assertEqual( opts.proxies, {'http' : 'http://www.proxy.com:9090'} ) + self.assertEqual( opts.opener, opener ) nopts = grabber.URLGrabberOptions(delegate=opts, throttle=0.5, copy_local=0) - self.assertEquals( nopts.progress_obj, self.meter ) - self.assertEquals( nopts.throttle, 0.5 ) - self.assertEquals( nopts.bandwidth, 20 ) - self.assertEquals( nopts.retry, 20 ) - self.assertEquals( nopts.retrycodes, [5,6,7] ) - self.assertEquals( nopts.copy_local, 0 ) - self.assertEquals( nopts.close_connection, 1 ) - self.assertEquals( nopts.user_agent, 'test ua/1.0' ) - self.assertEquals( nopts.proxies, {'http' : 'http://www.proxy.com:9090'} ) + self.assertEqual( nopts.progress_obj, self.meter ) + self.assertEqual( nopts.throttle, 0.5 ) + self.assertEqual( nopts.bandwidth, 20 ) + self.assertEqual( nopts.retry, 20 ) + self.assertEqual( nopts.retrycodes, [5,6,7] ) + self.assertEqual( nopts.copy_local, 0 ) + self.assertEqual( nopts.close_connection, 1 ) + self.assertEqual( nopts.user_agent, 'test ua/1.0' ) + self.assertEqual( nopts.proxies, {'http' : 'http://www.proxy.com:9090'} ) nopts.opener = None - self.assertEquals( nopts.opener, None ) + self.assertEqual( nopts.opener, None ) def test_make_callback(self): """grabber.URLGrabber._make_callback() tests""" def cb(e): pass tup_cb = (cb, ('stuff'), {'some': 'dict'}) g = URLGrabber() - self.assertEquals(g._make_callback(cb), (cb, (), {})) - self.assertEquals(g._make_callback(tup_cb), tup_cb) + self.assertEqual(g._make_callback(cb), (cb, (), {})) + self.assertEqual(g._make_callback(tup_cb), tup_cb) class URLParserTestCase(TestCase): def setUp(self): @@ -213,7 +213,7 @@ for b in bases: g = URLGrabber(prefix=b) (url, parts) = g.opts.urlparser.parse(filename, g.opts) - self.assertEquals(url, target) + self.assertEqual(url, target) def _test_url(self, urllist): g = URLGrabber() @@ -223,17 +223,17 @@ (url, parts) = g.opts.urlparser.parse(urllist[0], g.opts) if 1: - self.assertEquals(url, urllist[1]) - self.assertEquals(parts, urllist[2]) + self.assertEqual(url, urllist[1]) + self.assertEqual(parts, urllist[2]) else: if url == urllist[1] and parts == urllist[2]: - print('OK: %s' % urllist[0]) + print(('OK: %s' % urllist[0])) else: - print('ERROR: %s' % urllist[0]) - print(' ' + urllist[1]) - print(' ' + url) - print(' ' + urllist[2]) - print(' ' + parts) + print(('ERROR: %s' % urllist[0])) + print((' ' + urllist[1])) + print((' ' + url)) + print((' ' + urllist[2])) + print((' ' + parts)) url_tests_all = ( @@ -306,7 +306,7 @@ failure_callback=self._failure_callback) try: g.urlgrab(ref_404) except URLGrabError: pass - self.assertEquals(self.failure_callback_called, 1) + self.assertEqual(self.failure_callback_called, 1) def test_failure_callback_args(self): "failure callback is called with the proper args" @@ -315,14 +315,14 @@ failure_callback=fc) try: g.urlgrab(ref_404) except URLGrabError: pass - self.assert_(hasattr(self, 'obj')) - self.assert_(hasattr(self, 'args')) - self.assert_(hasattr(self, 'kwargs')) - self.assertEquals(self.args, ('foo',)) - self.assertEquals(self.kwargs, {'bar': 'baz'}) - self.assert_(isinstance(self.obj, CallbackObject)) - self.assertEquals(self.obj.url, ref_404) - self.assert_(isinstance(self.obj.exception, URLGrabError)) + self.assertTrue(hasattr(self, 'obj')) + self.assertTrue(hasattr(self, 'args')) + self.assertTrue(hasattr(self, 'kwargs')) + self.assertEqual(self.args, ('foo',)) + self.assertEqual(self.kwargs, {'bar': 'baz'}) + self.assertTrue(isinstance(self.obj, CallbackObject)) + self.assertEqual(self.obj.url, ref_404) + self.assertTrue(isinstance(self.obj.exception, URLGrabError)) del self.obj class InterruptTestCase(TestCase): @@ -351,7 +351,7 @@ interrupt_callback=ic) try: g.urlgrab(ref_http) except KeyboardInterrupt: pass - self.assertEquals(self.interrupt_callback_called, 1) + self.assertEqual(self.interrupt_callback_called, 1) def test_interrupt_callback_raises(self): "interrupt callback raises an exception" @@ -394,25 +394,25 @@ def _check_common_args(self): "check the args that are common to both urlgrab and urlread" - self.assert_(hasattr(self, 'obj')) - self.assert_(hasattr(self, 'args')) - self.assert_(hasattr(self, 'kwargs')) - self.assertEquals(self.args, ('foo',)) - self.assertEquals(self.kwargs, {'bar': 'baz'}) - self.assert_(isinstance(self.obj, CallbackObject)) - self.assertEquals(self.obj.url, short_ref_http) + self.assertTrue(hasattr(self, 'obj')) + self.assertTrue(hasattr(self, 'args')) + self.assertTrue(hasattr(self, 'kwargs')) + self.assertEqual(self.args, ('foo',)) + self.assertEqual(self.kwargs, {'bar': 'baz'}) + self.assertTrue(isinstance(self.obj, CallbackObject)) + self.assertEqual(self.obj.url, short_ref_http) def test_checkfunc_urlgrab_args(self): "check for proper args when used with urlgrab" self.g.urlgrab(short_ref_http, self.filename) self._check_common_args() - self.assertEquals(self.obj.filename, self.filename) + self.assertEqual(self.obj.filename, self.filename) def test_checkfunc_urlread_args(self): "check for proper args when used with urlread" self.g.urlread(short_ref_http) self._check_common_args() - self.assertEquals(self.obj.data, short_reference_data) + self.assertEqual(self.obj.data, short_reference_data) def test_checkfunc_urlgrab_success(self): "check success with urlgrab checkfunc" @@ -482,8 +482,8 @@ self.grabber.urlgrab(self.url, self.filename, reget='simple') data = self._read_file() - self.assertEquals(data[:int(self.hl)], '0'*int(self.hl)) - self.assertEquals(data[int(self.hl):], self.ref[int(self.hl):]) + self.assertEqual(data[:int(self.hl)], '0'*int(self.hl)) + self.assertEqual(data[int(self.hl):], self.ref[int(self.hl):]) class HTTPRegetTests(FTPRegetTests): def setUp(self): @@ -500,8 +500,8 @@ self.grabber.urlgrab(self.url, self.filename, reget='check_timestamp') data = self._read_file() - self.assertEquals(data[:int(self.hl)], '0'*int(self.hl)) - self.assertEquals(data[int(seRefactoringTool: Refactored ./test/test_byterange.py lf.hl):], self.ref[int(self.hl):]) + self.assertEqual(data[:int(self.hl)], '0'*int(self.hl)) + self.assertEqual(data[int(self.hl):], self.ref[int(self.hl):]) except NotImplementedError: self.skip() @@ -515,7 +515,7 @@ self.grabber.urlgrab(self.url, self.filename, reget='check_timestamp') data = self._read_file() - self.assertEquals(data, self.ref) + self.assertEqual(data, self.ref) except: self.skip() --- ./test/test_byterange.py (original) +++ ./test/test_byterange.py (refactored) @@ -40,7 +40,7 @@ # 0 1 2 3 4 5 6 7 8 9 # 0123456789012345678901234567890123456789012345678901234567 890123456789012345678901234567890 self.test = 'Why cannot we write the entire 24 volumes of Encyclopaedia\nBrittanica on the head of a pin?\n' - self.fo = StringIO(unicode(self.test) if not six.PY3 else self.test) + self.fo = StringIO(str(self.test) if not six.PY3 else self.test) self.rfo = RangeableFileObject(self.fo, (20,69)) def tearDown(self): @@ -49,38 +49,38 @@ def test_seek(self): """RangeableFileObject.seek()""" self.rfo.seek(11) - self.assertEquals('24', self.rfo.read(2)) + self.assertEqual('24', self.rfo.read(2)) self.rfo.seek(14) - self.assertEquals('volumes', self.rfo.read(7)) + self.assertEqual('volumes', self.rfo.read(7)) self.rfo.seek(1,1) - self.assertEquals('of', self.rfo.read(2)) + self.assertEqual('of', self.rfo.read(2)) def test_read(self): """RangeableFileObject.read()""" - self.assertEquals('the', self.rfo.read(3)) - self.assertEquals(' entire 24 volumes of ', self.rfo.read(22)) - self.assertEquals('Encyclopaedia\nBrittanica', self.rfo.read(50)) - self.assertEquals('', self.rfo.read()) + self.assertEqual('the', self.rfo.read(3)) + self.assertEqual(' entire 24 volumes of ', self.rfo.read(22)) + self.assertEqual('Encyclopaedia\nBrittanica', self.rfo.read(50)) + self.assertEqual('', self.rfo.read()) def test_readall(self): """RangeableFileObject.read(): to end of file.""" - text_compat = unicode(self.test) if not six.PY3 else self.test + text_compat = str(self.test) if not six.PY3 else self.test rfo = RangeableFileObject(StringIO(text_compat),(11,)) - self.assertEquals(self.test[11:],rfo.read()) + self.assertEqual(self.test[11:],rfo.read()) def test_readline(self): """RangeableFileObject.readline()""" - self.assertEquals('the entire 24 volumes of Encyclopaedia\n', self.rfo.readline()) - self.assertEquals('Brittanica', self.rfo.readline()) - self.assertEquals('', self.rfo.readline()) + self.assertEqual('the entire 24 volumes of Encyclopaedia\n', self.rfo.readline()) + self.assertEqual('Brittanica', self.rfo.readline()) + self.assertEqual('', self.rfo.readline()) def test_tell(self): """RangeableFileObject.tell()""" - self.assertEquals(0,self.rfo.tell()) + self.assertEqual(0,self.rfo.tell()) self.rfo.read(5) - self.assertEquals(5,self.rfo.tell()) + self.assertEqual(5,self.rfo.tell()) self.rfo.readline() - self.assertEquals(39,self.rfo.tell()) + self.assertEqual(39,self.rfo.tell()) class RangeModuleTestCase(TestCase): """Test module level functions defined in range.py""" @@ -104,7 +104,7 @@ (None, None) ) for test, ex in tests: - self.assertEquals( range_tuple_normalize(test), ex ) + self.assertEqual( range_tuple_normalize(test), ex ) try: range_tuple_normalize( (10,8) ) except RangeError: pass @@ -120,7 +120,7 @@ (None, None) RefactoringTool: No changes to ./test/runtests.py RefactoringTool: Refactored ./test/munittest.py RefactoringTool: Refactored ./test/grabberperf.py RefactoringTool: No changes to ./test/base_test_code.py RefactoringTool: Refactored ./setup.py RefactoringTool: Files that were modified: RefactoringTool: ./urlgrabber/progress.py RefactoringTool: ./urlgrabber/mirror.py RefactoringTool: ./urlgrabber/grabber.py RefactoringTool: ./urlgrabber/byterange.py RefactoringTool: ./urlgrabber/__init__.py RefactoringTool: ./test/threading/batchgrabber.py RefactoringTool: ./test/test_mirror.py RefactoringTool: ./test/test_grabber.py RefactoringTool: ./test/test_byterange.py RefactoringTool: ./test/runtests.py RefactoringTool: ./test/munittest.py RefactoringTool: ./test/grabberperf.py RefactoringTool: ./test/base_test_code.py RefactoringTool: ./setup.py RefactoringTool: Warnings/messages while refactoring: RefactoringTool: ### In file ./urlgrabber/byterange.py ### RefactoringTool: Line 347: could not convert: from urllib import ftpwrapper, addclosehook RefactoringTool: All module elements are invalid RefactoringTool: Line 347: could not convert: from urllib import ftpwrapper, addclosehook RefactoringTool: All module elements are invalid RefactoringTool: Line 347: could not convert: from urllib import ftpwrapper, addclosehook RefactoringTool: All module elements are invalid RefactoringTool: Line 347: could not convert: from urllib import ftpwrapper, addclosehook RefactoringTool: All module elements are invalid RefactoringTool: Line 347: could not convert: from urllib import ftpwrapper, addclosehook RefactoringTool: All module elements are invalid RefactoringTool: Line 347: could not convert: from urllib import ftpwrapper, addclosehook RefactoringTool: All module elements are invalid RefactoringTool: Line 347: could not convert: from urllib import ftpwrapper, addclosehook RefactoringTool: All module elements are invalid RefactoringTool: Line 347: could not convert: from urllib import ftpwrapper, addclosehook RefactoringTool: All module elements are invalid RefactoringTool: Line 347: could not convert: from urllib import ftpwrapper, addclosehook RefactoringTool: All module elements are invalid RefactoringTool: Line 347: could not convert: from urllib import ftpwrapper, addclosehook RefactoringTool: All module elements are invalid RefactoringTool: Line 347: could not convert: from urllib import ftpwrapper, addclosehook RefactoringTool: All module elements are invalid RefactoringTool: Line 347: could not convert: from urllib import ftpwrapper, addclosehook RefactoringTool: All module elements are invalid ) for test, ex in tests: - self.assertEquals( range_header_to_tuple(test), ex ) + self.assertEqual( range_header_to_tuple(test), ex ) def test_range_tuple_to_header(self): """byterange.range_tuple_to_header()""" @@ -134,7 +134,7 @@ (None, None), ) for test, ex in tests: - self.assertEquals( range_tuple_to_header(test), ex ) + self.assertEqual( range_tuple_to_header(test), ex ) try: range_tuple_to_header( ('not an int',500) ) except ValueError: pass --- ./test/munittest.py (original) +++ ./test/munittest.py (refactored) @@ -879,7 +879,7 @@ def usageExit(self, msg=None): if msg: print(msg) - print(self.USAGE % self.__dict__) + print((self.USAGE % self.__dict__)) sys.exit(2) def parseArgs(self, argv): --- ./test/grabberperf.py (original) +++ ./test/grabberperf.py (refactored) @@ -52,7 +52,7 @@ os.unlink(tempdst) def setuptemp(size): - if DEBUG: print('writing %d KB to temporary file (%s).' % (size / 1024, tempsrc)) + if DEBUG: print(('writing %d KB to temporary file (%s).' % (size / 1024, tempsrc))) file = open(tempsrc, 'w', 1024) chars = '0123456789' for i in range(size): @@ -122,7 +122,7 @@ if DEBUG: print('\r') - print("%d KB Results:" % (size / 1024)) + print(("%d KB Results:" % (size / 1024))) print_result('full', full_times) print_result('raw', raw_times) print_result('none', none_times) @@ -135,7 +135,7 @@ for i in result_list: mean += i mean = mean/len(result_list) median = result_list[int(len(result_list)/2)] - print(format % (label, mean, median, result_list[0], result_list[-1])) + print((format % (label, mean, median, result_list[0], result_list[-1]))) if __name__ == '__main__': main() --- ./setup.py (original) +++ ./setup.py (refactored) @@ -38,7 +38,7 @@ # load up distutils if __name__ == '__main__': config = globals().copy() - keys = config.keys() + keys = list(config.keys()) for k in keys: #print '%-20s -> %s' % (k, config[k]) if k.startswith('_'): del config[k] + exit 0 Executing(%build): /bin/sh -e /usr/src/tmp/rpm-tmp.61497 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + cd urlgrabber-3.10.1 + CFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2 -march=i586 -mtune=generic' + export CFLAGS + CXXFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2 -march=i586 -mtune=generic' + export CXXFLAGS + FFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2 -march=i586 -mtune=generic' + export FFLAGS + /usr/bin/python3 setup.py build Traceback (most recent call last): File "setup.py", line 3, in import urlgrabber as _urlgrabber File "/usr/src/RPM/BUILD/urlgrabber-3.10.1/urlgrabber/__init__.py", line 55, in from urlgrabber.grabber import urlgrab, urlopen, urlread File "/usr/src/RPM/BUILD/urlgrabber-3.10.1/urlgrabber/grabber.py", line 1001 self.async = None # blocking by default ^ SyntaxError: invalid syntax error: Bad exit status from /usr/src/tmp/rpm-tmp.61497 (%build) RPM build errors: Bad exit status from /usr/src/tmp/rpm-tmp.61497 (%build) Command exited with non-zero status 1 10.04user 0.19system 0:15.19elapsed 67%CPU (0avgtext+0avgdata 36404maxresident)k 0inputs+0outputs (0major+28625minor)pagefaults 0swaps hsh-rebuild: rebuild of `python3-module-urlgrabber-3.10.1-alt1.git20140204.2.src.rpm' failed. Command exited with non-zero status 1 22.32user 5.87system 0:33.26elapsed 84%CPU (0avgtext+0avgdata 116392maxresident)k 104inputs+0outputs (0major+439356minor)pagefaults 0swaps