Merge tag 'upstream/7.0.1'

Upstream version 7.0.1

1 files changed, 2 insertions, 3 deletions

diff --git a/scripts/set_version.py b/scripts/set_version.py
index 38ea03c..100a9f7 100755
--- a/scripts/set_version.py
+++ b/scripts/set_version.py
@@ -23,9 +23,8 @@ def sed_like_thing(pattern, repl, path):
         outf.write(data)
 
 if __name__ == "__main__":
-    print("New version number (in format X.Y.Z): ", end="")
-    sys.stdout.flush()
-    version = sys.stdin.readline().strip()
+    inpf = raw_input if sys.version_info[0] == 2 else input
+    version = inpf("New version number (in format X.Y.Z): ").strip()
 
     for doc in glob.glob(os.path.join("docs/*.txt")):
         sed_like_thing(":Version: .*", ":Version: {0}".format(version), doc)