class GitCommand:
def __getattr__(self, name):
- def call(*args):
+ def call(*args, split = True):
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()
# 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 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()
- 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)
- print "Versions newer than "+currentVersion+" available:"
- print tags
+ print("Versions newer than "+currentVersion+" available:")
+ print(tags)
# Fetch updates via SVN
class SVN:
return None
def checkVersions(self):
- print "Version checking not supporting with SVN"
+ print("Version checking not supporting with SVN")