0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some python syntax updates for the WML tools

Browse source
This commit is contained in:
Alexander van Gessel 2013-08-04 03:32:23 +02:00
parent 9f70495a41
commit 8f9861ef5e
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/tools/wesnoth/libgithub.py
View file

@ -182,7 +182,7 @@ class Addon(object):
self._execute(["git", "commit", "-F", tmpname], check_error=True)
os.remove(tmpname)
out, err, ret = self._execute(["git", "push", "-u", "--porcelain", "origin", "master"], check_error=False)
statusline = filter(lambda x: "refs/heads/master" in x, out.splitlines())
statusline = [x for x in out.splitlines() if "refs/heads/master" in x]
if not statusline:
raise AddonError(self.name, "No statusline produced by git push")
else:
@ -258,15 +258,15 @@ class Addon(object):
else:
shutil.copy2(srcname, dstname)
# XXX What about devices, sockets etc.?
except (IOError, os.error), why:
except (IOError, os.error) as why:
errors.append((srcname, dstname, str(why)))
# catch the Error from the recursive copytree so that we can
# continue with other files
except Error, err:
except Error as err:
errors.extend(err.args[0])
try:
shutil.copystat(src, dst)
except OSError, why:
except OSError as why:
if shutil.WindowsError is not None and isinstance(why, shutil.WindowsError):
# Copying file access times may fail on Windows
pass
@ -332,7 +332,7 @@ class GitHub(object):
if not os.path.isdir(self._absolute_path(name)):
logging.debug("Add-on {0} not found locally, checking github.".format(name))
github_list = self._github_repos_list(readonly=readonly)
matches = filter(lambda x: x[0] == name, github_list)
matches = [x for x in github_list if x[0] == name]
if matches:
repo = matches[0]
self._clone(repo[0], repo[1])

34
data/tools/wesnoth/wescamp.py
View file

@ -499,16 +499,16 @@ if __name__ == "__main__":
assert_campaignd(campaignd_configured)
try:
addons = list_addons(server, options.list_translatable)
except libgithub.AddonError, e:
except libgithub.AddonError as e:
print "[ERROR github in {0}] {1}".format(e.addon, str(e.message))
sys.exit(1)
except libgithub.Error, e:
except libgithub.Error as e:
print "[ERROR github] " + str(e)
sys.exit(1)
except socket.error, e:
except socket.error as e:
print "Socket error: " + str(e)
sys.exit(e[0])
except IOError, e:
except IOError as e:
print "Unexpected error occured: " + str(e)
sys.exit(e[0])
@ -528,16 +528,16 @@ if __name__ == "__main__":
try:
upload(server, options.upload, target, wescamp, build_sys_dir)
except libgithub.AddonError, e:
except libgithub.AddonError as e:
print "[ERROR github in {0}] {1}".format(e.addon, str(e.message))
sys.exit(1)
except libgithub.Error, e:
except libgithub.Error as e:
print "[ERROR github] " + str(e)
sys.exit(1)
except socket.error, e:
except socket.error as e:
print "Socket error: " + str(e)
sys.exit(e[0])
except IOError, e:
except IOError as e:
print "Unexpected error occured: " + str(e)
sys.exit(e[0])
@ -552,7 +552,7 @@ if __name__ == "__main__":
error = False
try:
addons = list_addons(server, True)
except socket.error, e:
except socket.error as e:
print "Socket error: " + str(e)
sys.exit(e[0])
for k, v in addons.iteritems():
@ -561,16 +561,16 @@ if __name__ == "__main__":
# Create a new temp dir for every upload.
tmp = tempdir()
upload(server, k, tmp.path, wescamp, build_sys_dir)
except libgithub.AddonError, e:
except libgithub.AddonError as e:
print "[ERROR github in {0}] {1}".format(e.addon, str(e.message))
error = True
except libgithub.Error, e:
except libgithub.Error as e:
print "[ERROR github] in addon '" + k + "'" + str(e)
error = True
except socket.error, e:
except socket.error as e:
print "Socket error: " + str(e)
error = True
except IOError, e:
except IOError as e:
print "Unexpected error occured: " + str(e)
error = True
@ -586,16 +586,16 @@ if __name__ == "__main__":
try:
checkout(wescamp, auth=git_auth, readonly=(options.checkout_readonly != None))
except libgithub.AddonError, e:
except libgithub.AddonError as e:
print "[ERROR github in {0}] {1}".format(e.addon, str(e.message))
sys.exit(1)
except libgithub.Error, e:
except libgithub.Error as e:
print "[ERROR github] " + str(e)
sys.exit(1)
except socket.error, e:
except socket.error as e:
print "Socket error: " + str(e)
sys.exit(e[0])
except IOError, e:
except IOError as e:
print "Unexpected error occured: " + str(e)
sys.exit(e[0])