From a9b1fd9079c4d3288b6247d626516f4c3349be16 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Mon, 16 Dec 2013 00:25:38 -0800 Subject: [PATCH] Some Python3 related fixes. --- examples/hdf5.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/hdf5.py b/examples/hdf5.py index 57b5672f..0cbf667f 100644 --- a/examples/hdf5.py +++ b/examples/hdf5.py @@ -25,7 +25,7 @@ if len(sys.argv) > 1: else: fileName = 'test.hdf5' if not os.path.isfile(fileName): - print "No suitable HDF5 file found. Use createFile() to generate an example file." + print("No suitable HDF5 file found. Use createFile() to generate an example file.") os._exit(1) plt = pg.plot() diff --git a/setup.py b/setup.py index 1d3f0b25..826bb57c 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ try: lastTag = gitCommit(lastTagName) head = gitCommit('HEAD') if head != lastTag: - branch = re.search(r'\* (.*)', check_output(['git', 'branch'])).group(1) + branch = re.search(r'\* (.*)', check_output(['git', 'branch'], universal_newlines=True)).group(1) version = version + "-%s-%s" % (branch, head[:10]) # any uncommitted modifications?