<86>Sep 14 10:56:45 userdel[3706166]: delete user 'rooter' <86>Sep 14 10:56:45 userdel[3706166]: removed group 'rooter' owned by 'rooter' <86>Sep 14 10:56:45 userdel[3706166]: removed shadow group 'rooter' owned by 'rooter' <86>Sep 14 10:56:45 groupadd[3706202]: group added to /etc/group: name=rooter, GID=705 <86>Sep 14 10:56:45 groupadd[3706202]: group added to /etc/gshadow: name=rooter <86>Sep 14 10:56:45 groupadd[3706202]: new group: name=rooter, GID=705 <86>Sep 14 10:56:45 useradd[3706216]: new user: name=rooter, UID=705, GID=705, home=/root, shell=/bin/bash <86>Sep 14 10:56:45 userdel[3706238]: delete user 'builder' <86>Sep 14 10:56:45 userdel[3706238]: removed group 'builder' owned by 'builder' <86>Sep 14 10:56:45 userdel[3706238]: removed shadow group 'builder' owned by 'builder' <86>Sep 14 10:56:45 groupadd[3706252]: group added to /etc/group: name=builder, GID=706 <86>Sep 14 10:56:45 groupadd[3706252]: group added to /etc/gshadow: name=builder <86>Sep 14 10:56:45 groupadd[3706252]: new group: name=builder, GID=706 <86>Sep 14 10:56:45 useradd[3706264]: new user: name=builder, UID=706, GID=706, home=/usr/src, shell=/bin/bash <13>Sep 14 10:56:47 rpmi: libgdbm-1.8.3-alt10 sisyphus+278100.1600.1.1 1626059138 installed <13>Sep 14 10:56:47 rpmi: libexpat-2.2.10-alt1 sisyphus+276608.100.1.2 1625153360 installed <13>Sep 14 10:56:47 rpmi: libp11-kit-0.23.15-alt2 sisyphus+278382.100.1.2 1626190687 installed <13>Sep 14 10:56:47 rpmi: libtasn1-4.17.0-alt1 sisyphus+276722.100.1.1 1625211286 installed <13>Sep 14 10:56:47 rpmi: rpm-macros-alternatives-0.5.1-alt1 sisyphus+278157.100.2.1 1626055790 installed <13>Sep 14 10:56:47 rpmi: alternatives-0.5.1-alt1 sisyphus+278157.100.2.1 1626055790 installed <13>Sep 14 10:56:47 rpmi: ca-certificates-2021.06.03-alt1 sisyphus+273509.400.1.1 1622736045 installed <13>Sep 14 10:56:47 rpmi: ca-trust-0.1.2-alt1 sisyphus+233348.100.1.1 1561653823 installed <13>Sep 14 10:56:47 rpmi: p11-kit-trust-0.23.15-alt2 sisyphus+278382.100.1.2 1626190687 installed <13>Sep 14 10:56:47 rpmi: libcrypto1.1-1.1.1l-alt1 sisyphus+283685.100.1.1 1629816097 installed <13>Sep 14 10:56:47 rpmi: libssl1.1-1.1.1l-alt1 sisyphus+283685.100.1.1 1629816097 installed <13>Sep 14 10:56:47 rpmi: python3-3.9.6-alt2 sisyphus+283178.100.2.1 1629243244 installed <13>Sep 14 10:56:48 rpmi: python3-base-3.9.6-alt2 sisyphus+283178.100.2.1 1629243244 installed <13>Sep 14 10:56:48 rpmi: libpython3-3.9.6-alt2 sisyphus+283178.100.2.1 1629243244 installed <13>Sep 14 10:56:48 rpmi: tests-for-installed-python3-pkgs-0.1.17-alt1 sisyphus+271082.100.1.1 1619820927 installed <13>Sep 14 10:56:48 rpmi: rpm-build-python3-0.1.17-alt1 sisyphus+271082.100.1.1 1619820927 installed <13>Sep 14 10:56:51 rpmi: libpython-2.7.18-alt7 sisyphus+284067.100.1.1 1630124815 installed <13>Sep 14 10:56:51 rpmi: python2-base-2.7.18-alt7 sisyphus+284067.100.1.1 1630124815 installed <13>Sep 14 10:56:51 rpmi: python-modules-encodings-2.7.18-alt7 sisyphus+284067.100.1.1 1630124815 installed <13>Sep 14 10:56:51 rpmi: python-modules-compiler-2.7.18-alt7 sisyphus+284067.100.1.1 1630124815 installed <13>Sep 14 10:56:51 rpmi: python-modules-email-2.7.18-alt7 sisyphus+284067.100.1.1 1630124815 installed <13>Sep 14 10:56:51 rpmi: python-modules-unittest-2.7.18-alt7 sisyphus+284067.100.1.1 1630124815 installed <13>Sep 14 10:56:51 rpmi: python-modules-2.7.18-alt7 sisyphus+284067.100.1.1 1630124815 installed <13>Sep 14 10:56:51 rpmi: python-modules-ctypes-2.7.18-alt7 sisyphus+284067.100.1.1 1630124815 installed <13>Sep 14 10:56:51 rpmi: python-modules-multiprocessing-2.7.18-alt7 sisyphus+284067.100.1.1 1630124815 installed <13>Sep 14 10:56:51 rpmi: python-modules-logging-2.7.18-alt7 sisyphus+284067.100.1.1 1630124815 installed <13>Sep 14 10:56:51 rpmi: python-tools-2to3-2.7.18-alt7 sisyphus+284067.100.1.1 1630124815 installed Building target platforms: i586 Building for target i586 Wrote: /usr/src/in/nosrpm/python3-module-repoze.obob-0.4-alt4.nosrc.rpm (w1.gzdio) <13>Sep 14 10:56:53 rpmi: python3-module-pkg_resources-1:57.4.0-alt1 sisyphus+280768.100.2.1 1627367207 installed <13>Sep 14 10:56:53 rpmi: libncurses-6.2.20210123-alt2 sisyphus+283886.200.2.1 1630022624 installed <13>Sep 14 10:56:53 rpmi: libtinfo-devel-6.2.20210123-alt2 sisyphus+283886.200.2.1 1630022624 installed <13>Sep 14 10:56:53 rpmi: libncurses-devel-6.2.20210123-alt2 sisyphus+283886.200.2.1 1630022624 installed <13>Sep 14 10:56:53 rpmi: python3-dev-3.9.6-alt2 sisyphus+283178.100.2.1 1629243244 installed <13>Sep 14 10:56:53 rpmi: python3-module-setuptools-1:57.4.0-alt1 sisyphus+280768.100.2.1 1627367207 installed Installing python3-module-repoze.obob-0.4-alt4.src.rpm Building target platforms: i586 Building for target i586 Executing(%prep): /bin/sh -e /usr/src/tmp/rpm-tmp.26884 + umask 022 + /bin/mkdir -p /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + cd /usr/src/RPM/BUILD + rm -rf python3-module-repoze.obob-0.4 + echo 'Source #0 (python3-module-repoze.obob-0.4.tar):' Source #0 (python3-module-repoze.obob-0.4.tar): + /bin/tar -xf /usr/src/RPM/SOURCES/python3-module-repoze.obob-0.4.tar + cd python3-module-repoze.obob-0.4 + /bin/chmod -c -Rf u+rwX,go-w . + cp -fR . ../python3 + 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: No changes to ./setup.py RefactoringTool: Refactored ./repoze/obob/tests/test_templates.py RefactoringTool: Refactored ./repoze/obob/tests/test_publisher.py RefactoringTool: No changes to ./repoze/obob/templates/newbob_skel/+package+/__init__.py RefactoringTool: No changes to ./repoze/obob/templates/__init__.py RefactoringTool: Refactored ./repoze/obob/publisher.py --- ./repoze/obob/tests/test_templates.py (original) +++ ./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) --- ./repoze/obob/tests/test_publisher.py (original) +++ ./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): --- ./repoze/obob/publisher.py (original) +++ ./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 @@ '', '