Wrap importing commands in try-catch to have Py3 compatibility (#129)

* Wrap importing commands in try-catch to have Py3 compatibility

* Changes from review

Author: iarspider

git-cms-cvs-history

@@ -1,5 +1,13 @@
-#!/usr/bin/env python
-from commands import getstatusoutput
+#!/bin/bash
+""":"
+python_cmd="python"
+python3 -V >/dev/null 2>&1 && python_cmd="python3"
+exec ${python_cmd} $0 ${1+"$@"}
+"""
+try:
+  from commands import getstatusoutput
+except ImportError:
+  from subprocess import getstatusoutput
 from optparse import OptionParser
 from sys import exit
 from os import environ, chdir
@@ -10,9 +18,9 @@ def format(s, **kwds):
   return s % kwds
 
 def die(s, verbose=None):
-  print s
+  print(s)
   if verbose:
-    print verbose
+    print(verbose)
   exit(1)
 
 def findSymbol(tag, package):
@@ -35,7 +43,7 @@ def findSymbol(tag, package):
   elif exists(join(cmssw_base, "src/.git", tagAttempt)):
     tag = tagAttempt
   else:
-    print branchAttempt
+    print(branchAttempt)
     die("Unable to find symbol %s for package %s." % (tag, realPackage))
   return tag
 
@@ -95,14 +103,14 @@ if __name__ == "__main__":
     err, output = getstatusoutput("git diff %s..%s" % (tags[0], tags[1]))
     if err:
       die("Could not create diff", output)
-    print output
+    print(output)
     exit(0)
   elif command == "tags":
     if len(args) == 1:
       parser.error("Please specify a package")
     err, output = getstatusoutput(format("git tag | grep -e '^%(package)s' | sed -e's/^%(package)s-//'", 
                                          package=package))
-    print output
+    print(output)
     exit(0)
   elif command == "import":
     tag = "master"
@@ -128,4 +136,4 @@ if __name__ == "__main__":
     err, output = getstatusoutput("git log refs/remotes/%s/%s" % (package, tag))
     if err:
       die("Error while doing git log", output)
-    print output
+    print(output)

git-cms-import-tagset

@@ -1,14 +1,23 @@
-#!/usr/bin/env python
+#!/bin/bash
+""":"
+python_cmd="python"
+python3 -V >/dev/null 2>&1 && python_cmd="python3"
+exec ${python_cmd} $0 ${1+"$@"}
+"""
 from optparse import OptionParser
-from commands import getstatusoutput
+try:
+  from commands import getstatusoutput
+except ImportError:
+  from subprocess import getstatusoutput
+
 from sys import exit
 
 def format(s, **kwds):
   return s.encode(errors="ignore") % kwds
 
 def die(*out):
   for x in out:
-    print x
+    print (x)
   exit(1)
 
 if __name__ == "__main__":
@@ -34,16 +43,16 @@ if __name__ == "__main__":
   for tagset in args:
     err, out = getstatusoutput("cmstc tagset %s" % tagset)
     pairs = [[y for y in x.split(" ") if y] for x in out.strip().split("\n")]
-    print pairs
+    print(pairs)
     getstatusoutput("rm -rf $CMSSW_BASE/src")
     for (pkg, tag) in pairs:
-      print pkg, tag
+      print(pkg, tag)
       err, out = getstatusoutput(format("set -e ; git cms-addpkg %(pkg)s; cd $CMSSW_BASE/src; cvs rdiff -r CMSSW_6_2_0_pre8 -r %(tag)s %(pkg)s | patch -p1",
                                  pkg=pkg,
                                  tag=tag))
       if err:
         die("Error while executing command", out)
-      print out
+      print(out)
     err, out = getstatusoutput(format("set -e ; cd $CMSSW_BASE/src ; git add -A . ; git commit -m \"`cmstc tagsetinfo %(tagset)s | grep -A100 -e'Description:' | grep -v -e '^Description:'`\"", 
                                tagset=tagset))
     if err:
@@ -58,18 +67,18 @@ if __name__ == "__main__":
                          strategy=opts.strategy,
                          strategyOption=opts.strategyOption,
                          merge=opts.merge)
-        print command
+        print(command)
         err, out = getstatusoutput(command)
     if err:
       die("Error while rebasing", out)
-    print out
+    print(out)
     if opts.dryRun:
       err, out = getstatusoutput("cd $CMSSW_BASE/src ; git show")
       if err:
         die("Error while doing git show", out)
-      print out
+      print(out)
       exit(0)
     err, out = getstatusoutput(format("cd $CMSSW_BASE/src ; git push my-cmssw -f HEAD:tagset-%s" % tagset))
     if err:
       die("Error while pushing to your repository", out)
-    print out
+    print(out)

git-cms-showtags

@@ -7,7 +7,10 @@ exec ${python_cmd} $0 ${1+"$@"}
 """
 
 from optparse import OptionParser
-from commands import getstatusoutput
+try:
+  from commands import getstatusoutput
+except ImportError:
+  from subprocess import getstatusoutput
 from os import environ
 from os.path import join, exists
 from sys import exit