diff --git a/helpers.py b/helpers.py index e66684f..a5552f1 100755 --- a/helpers.py +++ b/helpers.py @@ -41,7 +41,7 @@ def error(message): def die(message): - print >> sys.stderr, "emerge fatal error: %s" % message + print("emerge fatal error: %s" % message, file=sys.stderr) sys.exit(1) @@ -63,12 +63,12 @@ def system(cmdstring, file=None): def getOS_Name(): if os.path.exists("/etc/SuSE-release"): f = open("/etc/SuSE-release", "r") - rx = re.compile("^VERSION = (.*)$") + rx = re.compile(r"^VERSION = (.*)$") for line in f.readlines(): m = rx.match(line) if not m: - line = re.sub("\s", "", line) - line = re.sub("\([xX]86[-_]64\)", "", line) + line = re.sub(r"\s", "", line) + line = re.sub(r"\([xX]86[-_]64\)", "", line) line = line.replace("SUSE", "") line = line.replace("LinuxEnterpriseServer", "SLE") line = line.replace("LinuxEnterpriseDesktop", "SLE") @@ -76,7 +76,7 @@ def getOS_Name(): return "unknown" else: f = open("/etc/os-release", "r") - rx = re.compile('^PRETTY_NAME="(.*)"$') + rx = re.compile(r'^PRETTY_NAME="(.*)"$') for line in f.readlines(): m = rx.match(line) if m: diff --git a/make_rpm.py b/make_rpm.py index 9797ca1..2d96458 100755 --- a/make_rpm.py +++ b/make_rpm.py @@ -8,7 +8,7 @@ import shutil import subprocess import sys import time -import ConfigParser +import configparser import fnmatch @@ -169,7 +169,7 @@ class build(object): config_files.append(os.path.join(root, name)) for config_file in config_files: - config = ConfigParser.RawConfigParser() + config = configparser.ConfigParser() config.optionxform = str config.read(config_file) @@ -202,9 +202,7 @@ class build(object): def usage(): - print >> sys.stdout, "Usage: %s [-b ] -f -o -r -v -s " % sys.argv[ - 0 - ] + print("Usage: %s [-b ] -f -o -r -v -s " % sys.argv[0], file=sys.stderr) def main(): @@ -226,7 +224,7 @@ def main(): ], ) except getopt.GetoptError as err: - print >> sys.stderr, err + print(err, file=sys.stderr) usage() sys.exit(2) @@ -279,7 +277,7 @@ def main(): dstdir = os.path.join( b.output_dir, "%s-%s-%s" % (b.project_name, b.repository, full_version) ) - filter = re.compile("^.*%s\..*\.rpm$" % full_version) + filter = re.compile(r"^.*%s\..*\.rpm$" % full_version) moved_files = moveFilesToDir(rpmbase_dir, dstdir, filter, True) if rpm_filelist != None: diff --git a/make_rpm_ubuntu26.py b/make_rpm_ubuntu26.py old mode 100644 new mode 100755