<86>Apr 14 01:25:09 userdel[49076]: delete user 'rooter' <86>Apr 14 01:25:09 groupadd[49255]: group added to /etc/group: name=rooter, GID=597 <86>Apr 14 01:25:09 groupadd[49255]: group added to /etc/gshadow: name=rooter <86>Apr 14 01:25:09 groupadd[49255]: new group: name=rooter, GID=597 <86>Apr 14 01:25:09 useradd[49295]: new user: name=rooter, UID=597, GID=597, home=/root, shell=/bin/bash <86>Apr 14 01:25:09 userdel[49334]: delete user 'builder' <86>Apr 14 01:25:09 userdel[49334]: removed group 'builder' owned by 'builder' <86>Apr 14 01:25:09 userdel[49334]: removed shadow group 'builder' owned by 'builder' <86>Apr 14 01:25:09 groupadd[49370]: group added to /etc/group: name=builder, GID=598 <86>Apr 14 01:25:09 groupadd[49370]: group added to /etc/gshadow: name=builder <86>Apr 14 01:25:09 groupadd[49370]: new group: name=builder, GID=598 <86>Apr 14 01:25:09 useradd[49391]: new user: name=builder, UID=598, GID=598, home=/usr/src, shell=/bin/bash <13>Apr 14 01:25:13 rpmi: libexpat-2.2.4-alt0.M80P.1 1503871120 installed <13>Apr 14 01:25:13 rpmi: libgdbm-1.8.3-alt10 1454943313 installed <13>Apr 14 01:25:13 rpmi: libtinfo-devel-5.9-alt8 1456756459 installed <13>Apr 14 01:25:13 rpmi: libncurses-devel-5.9-alt8 1456756459 installed <13>Apr 14 01:25:13 rpmi: python-modules-curses-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:13 rpmi: libverto-0.2.6-alt1_6 1455633234 installed <13>Apr 14 01:25:13 rpmi: libkeyutils-1.5.10-alt0.M80P.2 p8+216694.100.6.1 1547827915 installed <13>Apr 14 01:25:13 rpmi: libcom_err-1.42.13-alt2 1449075846 installed <13>Apr 14 01:25:13 rpmi: ca-certificates-2016.02.25-alt1 1462368370 installed <13>Apr 14 01:25:13 rpmi: libcrypto10-1.0.2n-alt0.M80P.1 1512766129 installed <13>Apr 14 01:25:13 rpmi: libssl10-1.0.2n-alt0.M80P.1 1512766129 installed <86>Apr 14 01:25:13 groupadd[68287]: group added to /etc/group: name=_keytab, GID=499 <86>Apr 14 01:25:13 groupadd[68287]: group added to /etc/gshadow: name=_keytab <86>Apr 14 01:25:13 groupadd[68287]: new group: name=_keytab, GID=499 <13>Apr 14 01:25:13 rpmi: libkrb5-1.14.6-alt1.M80P.1 1525355673 installed <13>Apr 14 01:25:14 rpmi: python3-base-3.5.4-alt2.M80P.1 1527753911 installed <13>Apr 14 01:25:14 rpmi: python3-3.5.4-alt2.M80P.1 1527753911 installed <13>Apr 14 01:25:14 rpmi: python-modules-compiler-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:14 rpmi: rpm-build-python3-0.1.10.10-alt1.M80P.1 1530521451 installed <13>Apr 14 01:25:14 rpmi: libpython3-3.5.4-alt2.M80P.1 1527753911 installed <13>Apr 14 01:25:14 rpmi: python3-module-py-1.4.34-alt0.M80P.1 1503506764 installed <13>Apr 14 01:25:15 rpmi: python3-dev-3.5.4-alt2.M80P.1 1527753911 installed <13>Apr 14 01:25:15 rpmi: python-modules-email-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python3-module-pytest-3.2.1-alt0.M80P.1 1503499784 installed <13>Apr 14 01:25:15 rpmi: python3-module-setuptools-1:18.5-alt0.M80P.1 1497527461 installed <13>Apr 14 01:25:15 rpmi: python-modules-unittest-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python-modules-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python-modules-ctypes-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python-modules-encodings-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python-modules-multiprocessing-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python-modules-logging-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python-tools-2to3-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python-modules-xml-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python-modules-hotshot-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python-modules-bsddb-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python-dev-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python-module-py-1.4.34-alt0.M80P.1 1503506764 installed <13>Apr 14 01:25:15 rpmi: python-modules-json-2.7.11-alt6.M80P.1 1527682470 installed <13>Apr 14 01:25:15 rpmi: python-module-pytest-3.2.1-alt0.M80P.1 1503499784 installed <13>Apr 14 01:25:16 rpmi: python-module-setuptools-1:18.5-alt0.M80P.1 1497527461 installed Installing python-module-repoze.obob-0.4-alt3.1.src.rpm Building target platforms: x86_64 Building for target x86_64 Executing(%prep): /bin/sh -e /usr/src/tmp/rpm-tmp.97586 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + rm -rf python-module-repoze.obob-0.4 + echo 'Source #0 (python-module-repoze.obob-0.4.tar):' Source #0 (python-module-repoze.obob-0.4.tar): + /bin/tar -xf /usr/src/RPM/SOURCES/python-module-repoze.obob-0.4.tar + cd python-module-repoze.obob-0.4 + /bin/chmod -c -Rf u+rwX,go-w . + cp -fR . ../python3 + find ../python3 -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: No changes to ../python3/setup.py RefactoringTool: Refactored ../python3/repoze/obob/tests/test_templates.py RefactoringTool: Refactored ../python3/repoze/obob/tests/test_publisher.py RefactoringTool: No changes to ../python3/repoze/obob/templates/newbob_skel/+package+/__init__.py RefactoringTool: No changes to ../python3/repoze/obob/templates/__init__.py RefactoringTool: Refactored ../python3/repoze/obob/publisher.py --- ../python3/repoze/obob/tests/test_templates.py (original) +++ ../python3/repoze/obob/tests/test_templates.py (refactored) @@ -23,10 +23,10 @@ command = DummyCommand() newbob.run(command, dn, vars) j = os.path.join - self.failUnless(os.path.isdir(j(dn, 'package'))) - self.failUnless(os.path.exists(j(dn, 'setup.py'))) - self.failUnless(os.path.exists(j(dn, 'package', '__init__.py'))) - self.failUnless(os.path.exists(j(dn, 'package', 'tests.py'))) + self.assertTrue(os.path.isdir(j(dn, 'package'))) + self.assertTrue(os.path.exists(j(dn, 'setup.py'))) + self.assertTrue(os.path.exists(j(dn, 'package', '__init__.py'))) + self.assertTrue(os.path.exists(j(dn, 'package', 'tests.py'))) finally: shutil.rmtree(dn) --- ../python3/repoze/obob/tests/test_publisher.py (original) +++ ../python3/repoze/obob/tests/test_publisher.py (refactored) @@ -45,7 +45,7 @@ self.assertEqual(len(called_with), 1) self.assertEqual(called_with[0][0], ()) self.assertEqual(called_with[0][1], {}) - self.failUnless(result is RESULT) + self.assertTrue(result is RESULT) def test_map_result_default_result_is_string(self): helper = self._makeOne() @@ -94,9 +94,9 @@ klass = self._getTargetClass() for plugpoint in _PLUGPOINTS: - from_instance = getattr(obob, plugpoint).im_func - from_class = getattr(klass, plugpoint).im_func - self.failUnless(from_instance is from_class) + from_instance = getattr(obob, plugpoint).__func__ + from_class = getattr(klass, plugpoint).__func__ + self.assertTrue(from_instance is from_class) def test_ctor_overrides(self): @@ -105,13 +105,13 @@ obob = self._makeOne(get_root=_gr, helper_factory=_hf) - self.failUnless(obob.get_root is _gr) - self.failUnless(obob.helper_factory is _hf) + self.assertTrue(obob.get_root is _gr) + self.assertTrue(obob.helper_factory is _hf) def test_get_root_default_empty(self): obob = self._makeOne() environ = object() - self.assertEqual(obob.get_root(environ).keys(), {}.keys()) + self.assertEqual(list(obob.get_root(environ).keys()), list({}.keys())) def test_get_root_default_nonempty(self): def _baz(): @@ -121,7 +121,7 @@ obob = self._makeOne(dispatchable=dispatchable, extras=extras) environ = object() root = obob.get_root(environ) - self.assertEqual(root.keys(), {'baz': 1}.keys()) + self.assertEqual(list(root.keys()), list({'baz': 1}.keys())) self.assertEqual(root['baz'], _baz) self.assertEqual(obob.extras, {'foo': 'bar'}) @@ -153,7 +153,7 @@ self.assertEqual(len(PASSED), 1) self.assertEqual(len(PASSED[0]), 2) - self.failUnless(PASSED[0][0] is environ) + self.assertTrue(PASSED[0][0] is environ) self.assertEqual(PASSED[0][1], EXTRAS) def test___call__default_empty_root(self): --- ../python3/repoze/obob/publisher.py (original) +++ ../python3/repoze/obob/publisher.py (refactored) @@ -76,7 +76,7 @@ @param object result Result of calling published object @return tuple WSGI triple: (status, headers, body_iter) """ - if isinstance(result, basestring): + if isinstance(result, str): result = [result] return '200 OK', [('Content-Type', 'text/html')], result @@ -95,7 +95,7 @@ """ t, v, tb = exc_info try: - raise t, v, tb + raise t(v).with_traceback(tb) finally: del tb @@ -198,7 +198,7 @@ self._dispatchable = dispatchable def keys(self): - return self._dispatchable.keys() + return list(self._dispatchable.keys()) def __getitem__(self, key): return self._dispatchable[key] @@ -208,7 +208,7 @@ '', RefactoringTool: No changes to ../python3/repoze/__init__.py RefactoringTool: Files that were modified: RefactoringTool: ../python3/setup.py RefactoringTool: ../python3/repoze/obob/tests/test_templates.py RefactoringTool: ../python3/repoze/obob/tests/test_publisher.py RefactoringTool: ../python3/repoze/obob/templates/newbob_skel/+package+/__init__.py RefactoringTool: ../python3/repoze/obob/templates/__init__.py RefactoringTool: ../python3/repoze/obob/publisher.py RefactoringTool: ../python3/repoze/__init__.py '