From 77749cf27337034dd4770880e489a3416a3dd1c0 Mon Sep 17 00:00:00 2001 From: Ivan Razumov Date: Wed, 23 Apr 2025 15:50:26 +0200 Subject: [PATCH] Wrap importing commands in try-catch to have Py3 compatibility --- git-cms-cvs-history | 5 ++++- git-cms-import-tagset | 6 +++++- git-cms-showtags | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/git-cms-cvs-history b/git-cms-cvs-history index 556ae64..ecdd2be 100755 --- a/git-cms-cvs-history +++ b/git-cms-cvs-history @@ -1,5 +1,8 @@ #!/usr/bin/env python -from commands import getstatusoutput +try: + from commands import getstatusoutput +except ImportError: + from subprocess import getstatusoutput from optparse import OptionParser from sys import exit from os import environ, chdir diff --git a/git-cms-import-tagset b/git-cms-import-tagset index 1d8e0e6..eeece6a 100755 --- a/git-cms-import-tagset +++ b/git-cms-import-tagset @@ -1,6 +1,10 @@ #!/usr/bin/env python 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): diff --git a/git-cms-showtags b/git-cms-showtags index 64af4b2..ae53c29 100755 --- a/git-cms-showtags +++ b/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