convert to python 3

diff --git a/build_system.py b/build_system.py
index 75b55376aff6b85ec68d6ead64da0352282349ae..634f73d671bd5751b678a62a1d9f2ce7655f7e37 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -67,7 +67,7 @@ class CMake:
                self.restoreEnv('XDG_CONFIG_DIRS', oldXDGConfigDirs)
                # if asked to do so, wait
                if waitAfterConfig:
                self.restoreEnv('XDG_CONFIG_DIRS', oldXDGConfigDirs)
                # if asked to do so, wait
                if waitAfterConfig:

-                       raw_input('Configuration done. Hit "Enter" to build the project. ')
+                       input('Configuration done. Hit "Enter" to build the project. ')

                # run compilation
                jobs = int(self.config['jobs'])
                subprocess.check_call(self.config.get('buildCmdPrefix', []) + ['make', '-j'+str(jobs)])
                # run compilation
                jobs = int(self.config['jobs'])
                subprocess.check_call(self.config.get('buildCmdPrefix', []) + ['make', '-j'+str(jobs)])

diff --git a/mass_build.py b/mass_build.py
index 814fa3efa397901af2452cc3d8c64660359d3f65..93ae5a3280408cc800c7b4fa9a21e35e1021535e 100755 (executable)
--- a/mass_build.py
+++ b/mass_build.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3

 # mass-build - Easily Build Software Involving a Large Amount of Source Repositories
 # Copyright (C) 2012-2013 Ralf Jung <post@ralfj.de>
 #
 # mass-build - Easily Build Software Involving a Large Amount of Source Repositories
 # Copyright (C) 2012-2013 Ralf Jung <post@ralfj.de>
 #


@@ -79,15 +79,19 @@ if args.reset_source and not args.update:
        raise Exception("Can not reset sources without doing an update")
 
 # load config
        raise Exception("Can not reset sources without doing an update")
 
 # load config

+old_val = sys.dont_write_bytecode
+sys.dont_write_bytecode = True

 config = imp.load_source('config', args.config).__dict__
 config = imp.load_source('config', args.config).__dict__

-os.remove(args.config+'c') # remove compiled python file
+sys.dont_write_bytecode = old_val
+
+# initialise variables holding the configuration

 allProjects = OrderedDict() # all projects
 allFolders = {} # all folders
 workProjects = [] # projects we work on
 
 # copy all items which don't exist below, except for those in the exclude list
 def inherit(subConfig, superConfig, exclude = ('name', 'projects')):
 allProjects = OrderedDict() # all projects
 allFolders = {} # all folders
 workProjects = [] # projects we work on
 
 # copy all items which don't exist below, except for those in the exclude list
 def inherit(subConfig, superConfig, exclude = ('name', 'projects')):

-       for name in superConfig.keys():
+       for name in list(superConfig.keys()):

                if (not name in subConfig) and (not name in exclude):
                        subConfig[name] = superConfig[name]
 
                if (not name in subConfig) and (not name in exclude):
                        subConfig[name] = superConfig[name]
 


@@ -123,7 +127,7 @@ if args.projects:
                else:
                        raise Exception("Project or folder %s does not exist" % name)
 else:
                else:
                        raise Exception("Project or folder %s does not exist" % name)
 else:

-       workProjects = allProjects.values() # all the projects
+       workProjects = list(allProjects.values()) # all the projects

 # apply the "resume from"
 if args.resume_from is not None:
        # find project index
 # apply the "resume from"
 if args.resume_from is not None:
        # find project index


@@ -142,22 +146,22 @@ if args.resume_from is not None:
 for project in workProjects:
        try:
                if args.version_check:
 for project in workProjects:
        try:
                if args.version_check:

-                       print "Checking project",project.sourceFolder()
+                       print("Checking project",project.sourceFolder())

                        project.vcs.checkVersions()
                else:
                        if args.update:
                        project.vcs.checkVersions()
                else:
                        if args.update:

-                               print "Updating project",project.sourceFolder()
+                               print("Updating project",project.sourceFolder())

                                project.vcs.update(mode = vcs.MODE_RESET if args.reset_source else vcs.MODE_REBASE)
                                project.vcs.update(mode = vcs.MODE_RESET if args.reset_source else vcs.MODE_REBASE)

-                       print "Building project",project.sourceFolder()
+                       print("Building project",project.sourceFolder())

                        project.buildSystem.build(reconfigure=args.reconfigure, waitAfterConfig=args.wait_after_config)
                        project.buildSystem.build(reconfigure=args.reconfigure, waitAfterConfig=args.wait_after_config)

-               print
+               print()

        except (subprocess.CalledProcessError, KeyboardInterrupt) as e: # for some exceptions, a stackrace is usually pointless
        except (subprocess.CalledProcessError, KeyboardInterrupt) as e: # for some exceptions, a stackrace is usually pointless

-               print >> sys.stderr
-               print >> sys.stderr
+               print(file=sys.stderr)
+               print(file=sys.stderr)

                if isinstance(e, KeyboardInterrupt): # str(e) would be the empty string
                if isinstance(e, KeyboardInterrupt): # str(e) would be the empty string

-                       print >> sys.stderr, "Interruped by user while processing %s" % (project.name)
+                       print("Interruped by user while processing %s" % (project.name), file=sys.stderr)

                else:
                else:

-                       print >> sys.stderr, "Error while processing %s: %s" % (project.name, str(e))
-               print >> sys.stderr
+                       print("Error while processing %s: %s" % (project.name, str(e)), file=sys.stderr)
+               print(file=sys.stderr)

                sys.exit(1)
                sys.exit(1)

-print "All operations successfully completed"
+print("All operations successfully completed")

diff --git a/vcs.py b/vcs.py
index 8d8d836284a95360222bb16b786777af7d6bc9f3..c1068fb73bec0b95ecc896199c48033844be5840 100644 (file)
--- a/vcs.py
+++ b/vcs.py
@@ -32,13 +32,14 @@ def get_non_digit_prefix(val):
 
 class GitCommand:
        def __getattr__(self, name):
 
 class GitCommand:
        def __getattr__(self, name):

-               def call(*args):
+               def call(*args, split = True):

                        cmd = ["git", name.replace('_', '-')] + list(args)
                        cmd = ["git", name.replace('_', '-')] + list(args)

-                       p = subprocess.Popen(cmd, stdout=subprocess.PIPE) # TODO use with
-                       (stdout, stderr) = p.communicate()
-                       if p.returncode != 0:
-                               raise Exception("Running %s returned non-zero exit code %d" % (str(cmd), p.returncode))
-                       return filter(len, stdout.split('\n')) # return list of non-empty lines
+                       with subprocess.Popen(cmd, stdout=subprocess.PIPE) as p:
+                               (stdout, stderr) = p.communicate()
+                               if p.returncode != 0:
+                                       raise Exception("Running %s returned non-zero exit code %d" % (str(cmd), p.returncode))
+                       stdout = stdout.decode('utf-8').strip('\n')
+                       return stdout.split('\n') if split else stdout

                return call
 git = GitCommand()
 
                return call
 git = GitCommand()
 


@@ -83,10 +84,10 @@ class Git:
                # update submodules
                git.submodule("update", "--init", "--recursive", "--rebase")
                # done
                # update submodules
                git.submodule("update", "--init", "--recursive", "--rebase")
                # done

-               print "...done",
-               if git.rev_parse("HEAD")[0] != git.rev_parse(self.commit)[0]:
-                       print "(keeping local patches around)",
-               print
+               print("...done", end=' ')
+               if git.rev_parse("HEAD", split=False) != git.rev_parse(self.commit, split=False):
+                       print("(keeping local patches around)", end=' ')
+               print()

 
        def version(self):
                repo = git.Repo(self.folder)
 
        def version(self):
                repo = git.Repo(self.folder)


@@ -95,14 +96,14 @@ class Git:
 
        def checkVersions(self):
                self.update(mode = MODE_FETCH)
 
        def checkVersions(self):
                self.update(mode = MODE_FETCH)

-               currentVersion = git.describe()[0]
+               currentVersion = git.describe(split=False)

                # get sorted list of tag names with the same non-digit prefix and higher version number
                tags = git.tag()
                # get sorted list of tag names with the same non-digit prefix and higher version number
                tags = git.tag()

-               tags = filter(lambda t: get_non_digit_prefix(t) == get_non_digit_prefix(currentVersion) and natural_sort_key(t) > natural_sort_key(currentVersion), tags)
+               tags = [t for t in tags if get_non_digit_prefix(t) == get_non_digit_prefix(currentVersion) and natural_sort_key(t) > natural_sort_key(currentVersion)]

                if not tags: return
                tags.sort(key = natural_sort_key)
                if not tags: return
                tags.sort(key = natural_sort_key)

-               print "Versions newer than "+currentVersion+" available:"
-               print tags
+               print("Versions newer than "+currentVersion+" available:")
+               print(tags)

 
 # Fetch updates via SVN
 class SVN:
 
 # Fetch updates via SVN
 class SVN:


@@ -124,4 +125,4 @@ class SVN:
                return None
        
        def checkVersions(self):
                return None
        
        def checkVersions(self):

-               print "Version checking not supporting with SVN"
+               print("Version checking not supporting with SVN")