summaryrefslogtreecommitdiffstats
path: root/tools/export.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2011-04-04 09:24:37 -0500
committerSol Jerome <sol.jerome@gmail.com>2011-04-06 19:35:21 -0500
commit8f4a2394638912b000682e2211723e4a644915e1 (patch)
treedcc8bfe8939154ade2c2f4be99758f0f441698d4 /tools/export.py
parent50d489f38e18577cb7e75605515d4b8d567aaa52 (diff)
downloadbcfg2-8f4a2394638912b000682e2211723e4a644915e1.tar.gz
bcfg2-8f4a2394638912b000682e2211723e4a644915e1.tar.bz2
bcfg2-8f4a2394638912b000682e2211723e4a644915e1.zip
tools: Fixes from a second 2to3 run
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'tools/export.py')
-rwxr-xr-xtools/export.py15
1 files changed, 12 insertions, 3 deletions
diff --git a/tools/export.py b/tools/export.py
index 2d8d38e20..5e48a3613 100755
--- a/tools/export.py
+++ b/tools/export.py
@@ -12,7 +12,11 @@ import sys
pkgname = 'bcfg2'
ftphost = 'terra.mcs.anl.gov'
ftpdir = '/mcs/ftp/pub/bcfg'
-version = input("Please enter the version you are tagging (e.g. 1.0.0): ")
+# py3k compatibility
+try:
+ version = raw_input("Please enter the version you are tagging (e.g. 1.0.0): ")
+except NameError:
+ version = input("Please enter the version you are tagging (e.g. 1.0.0): ")
tarname = '/tmp/%s-%s.tar.gz' % (pkgname, version)
@@ -22,8 +26,13 @@ def run(command):
# update the version
majorver = version[:5]
minorver = version[5:]
-name = input("Your name: ")
-email = input("Your email: ")
+# py3k compatibility
+try:
+ name = raw_input("Your name: ")
+ email = raw_input("Your email: ")
+except NameError:
+ name = input("Your name: ")
+ email = input("Your email: ")
newchangelog = \
"""bcfg2 (%s-0.0%s) unstable; urgency=low