-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
#
# fdroid.py - part of the FDroid server tools
# Copyright (C) 2010-2015, Ciaran Gultnieks, ciaran@ciarang.com
-# Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc>
+# Copyright (C) 2013-2014 Daniel Marti <mvdan@mvdan.cc>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
def print_help():
- print "usage: fdroid [-h|--help|--version] <command> [<args>]"
- print
- print "Valid commands are:"
+ print("usage: fdroid [-h|--help|--version] <command> [<args>]")
+ print("")
+ print("Valid commands are:")
for cmd, summary in commands.items():
- print " " + cmd + ' ' * (15 - len(cmd)) + summary
- print
+ print(" " + cmd + ' ' * (15 - len(cmd)) + summary)
+ print("")
def main():
import subprocess
try:
output = subprocess.check_output(['git', 'describe'],
- stderr=subprocess.STDOUT)
+ stderr=subprocess.STDOUT,
+ universal_newlines=True)
except subprocess.CalledProcessError:
- output = 'git commit ' + subprocess.check_output(['git', 'rev-parse', 'HEAD'])
+ output = 'git commit ' + subprocess.check_output(['git', 'rev-parse', 'HEAD'],
+ universal_newlines=True)
elif os.path.exists('setup.py'):
import re
m = re.search(r'''.*[\s,\(]+version\s*=\s*["']([0-9a-z.]+)["'].*''',
print(output),
sys.exit(0)
else:
- print "Command '%s' not recognised.\n" % command
+ print("Command '%s' not recognised.\n" % command)
print_help()
sys.exit(1)
sys.exit(1)
# These should only be unexpected crashes due to bugs in the code
# str(e) often doesn't contain a reason, so just show the backtrace
- except Exception, e:
+ except Exception as e:
logging.critical("Unknown exception found!")
raise
sys.exit(0)