From ecc9bf36aa9a8d5185e7fc3cb23594a0b8a2a9e3 Mon Sep 17 00:00:00 2001 From: Markus Zehner <56972144+MarkusZehner@users.noreply.github.com> Date: Thu, 7 May 2020 17:42:32 +0200 Subject: [PATCH 1/3] Update setup.py --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 4456a8a..29694f8 100644 --- a/setup.py +++ b/setup.py @@ -82,9 +82,9 @@ def validate_modules(requires): def print_not_found(not_found, msg): limits = "=" * max(map(len, not_found)) - print "\n{}\n{}\n{}\n{}\n".format(msg, limits, + print("\n{}\n{}\n{}\n{}\n".format(msg, limits, "\n".join(not_found), - limits) + limits)) not_found = validate_modules(MANUAL_REQUIRE) if not_found: From 76f543e96db83169ad9bc821fc4815e46cfcf205 Mon Sep 17 00:00:00 2001 From: Markus Zehner <56972144+MarkusZehner@users.noreply.github.com> Date: Thu, 7 May 2020 17:47:08 +0200 Subject: [PATCH 2/3] Update ez_setup.py --- ez_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ez_setup.py b/ez_setup.py index 2859573..ebc0747 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -103,7 +103,7 @@ def do_download(): return do_download() try: pkg_resources.require("setuptools>=" + version); return - except pkg_resources.VersionConflict, e: + except pkg_resources.VersionConflict as e: if was_imported: print >> sys.stderr, ( "The required version of setuptools (>=%s) is not available, and\n" From 8ac9fa94afe44cb4295f85f2dd70dc73feabc42d Mon Sep 17 00:00:00 2001 From: Markus Zehner <56972144+MarkusZehner@users.noreply.github.com> Date: Thu, 7 May 2020 17:50:23 +0200 Subject: [PATCH 3/3] Update ez_setup.py --- ez_setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ez_setup.py b/ez_setup.py index ebc0747..8796240 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -238,8 +238,8 @@ def main(argv, version=DEFAULT_VERSION): from setuptools.command.easy_install import main main(argv) else: - print "Setuptools version", version, "or greater has been installed." - print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)' + print("Setuptools version", version, "or greater has been installed.") + print('(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)') def update_md5(filenames): """Update our built-in md5 registry""" @@ -262,7 +262,7 @@ def update_md5(filenames): match = re.search("\nmd5_data = {\n([^}]+)}", src) if not match: - print >> sys.stderr, "Internal error!" + print("Internal error!", file=sys.stderr) sys.exit(2) src = src[:match.start(1)] + repl + src[match.end(1):]