Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ez_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"""
Expand All @@ -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):]
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down