John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/243092
Change subject: Python 3 support ...................................................................... Python 3 support All tests pass on Python 3 with one small fix applied to zuul. https://review.openstack.org/230233 Change-Id: I0d5dd01b1253a49e9c7bb6963d8dab4ba5d22718 --- M bin/jenkins-jobs-list.py M bin/mw-api-siteinfo.py M bin/mw-sort-wmf-branches.py M bin/npm-install-dev.py M tests/test_commit-message-validator.py M tools/commit-message-validator.py M tools/puppet_pep8.py M tools/yamllint.py 8 files changed, 19 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins refs/changes/92/243092/1 diff --git a/bin/jenkins-jobs-list.py b/bin/jenkins-jobs-list.py index abe1ff7..fb882ff 100755 --- a/bin/jenkins-jobs-list.py +++ b/bin/jenkins-jobs-list.py @@ -7,4 +7,4 @@ req = urllib2.urlopen(JENKINS_API_JOBS_URL) result = json.load(req) -print "\n".join([job.get('name') for job in result.get('jobs')]) +print("\n".join([job.get('name') for job in result.get('jobs')])) diff --git a/bin/mw-api-siteinfo.py b/bin/mw-api-siteinfo.py index 0ab93c3..1e74c3b 100755 --- a/bin/mw-api-siteinfo.py +++ b/bin/mw-api-siteinfo.py @@ -83,10 +83,10 @@ if options.list: normalized_keys = [normalize(k) for k in mwresponse.query.general.__dict__.keys()] - print '\n'.join(sorted(normalized_keys)) + print('\n'.join(sorted(normalized_keys))) else: for field in options.fields: - print getattr(mwresponse.query.general, field) + print(getattr(mwresponse.query.general, field)) if __name__ == '__main__': main() diff --git a/bin/mw-sort-wmf-branches.py b/bin/mw-sort-wmf-branches.py index bc598ec..ca6976f 100755 --- a/bin/mw-sort-wmf-branches.py +++ b/bin/mw-sort-wmf-branches.py @@ -22,4 +22,4 @@ VERSIONS.sort(key=distutils.version.LooseVersion) -print "\n".join(VERSIONS) +print("\n".join(VERSIONS)) diff --git a/bin/npm-install-dev.py b/bin/npm-install-dev.py index 37ecb18..4077f1f 100755 --- a/bin/npm-install-dev.py +++ b/bin/npm-install-dev.py @@ -16,7 +16,7 @@ deps = dict() -print '[*] NPM devDependencies Installation [*]' +print('[*] NPM devDependencies Installation [*]') with open('./package.json') as fd: pkg_info = json.load(fd) @@ -24,7 +24,7 @@ deps = pkg_info['devDependencies'] for pkg in iter(deps): - print 'Installing', pkg, '...' + print('Installing', pkg, '...') subprocess.check_output(['npm', 'install', pkg + '@' + deps[pkg]]) -print '[*] NPM devDependencies Done [*]' +print('[*] NPM devDependencies Done [*]') diff --git a/tests/test_commit-message-validator.py b/tests/test_commit-message-validator.py index 0919a5d..691bf40 100644 --- a/tests/test_commit-message-validator.py +++ b/tests/test_commit-message-validator.py @@ -2,9 +2,10 @@ import imp import os -import StringIO import sys import unittest + +from io import StringIO cmv = imp.load_source( 'cmv', @@ -28,7 +29,7 @@ def test(self): saved_stdout = sys.stdout try: - out = StringIO.StringIO() + out = StringIO() sys.stdout = out self.assertEqual( 1 if expected else 0, diff --git a/tools/commit-message-validator.py b/tools/commit-message-validator.py index 4852c8e..633a0bb 100755 --- a/tools/commit-message-validator.py +++ b/tools/commit-message-validator.py @@ -141,7 +141,7 @@ if errors: for e in errors: - print e + print(e) return 1 return 0 diff --git a/tools/puppet_pep8.py b/tools/puppet_pep8.py index 2bf1c98..719ed04 100755 --- a/tools/puppet_pep8.py +++ b/tools/puppet_pep8.py @@ -36,7 +36,7 @@ # Craft a relative path to get shorter lines output rel_path = os.path.relpath(file_path, args.path) - print "Checking file %s" % file_path + print("Checking file %s" % file_path) cmd = ('pep8', rel_path) # Invoke pep8 from the directory passed as an argument @@ -44,8 +44,8 @@ success = False if success: - print "\n\nAll tests passed." + print("\n\nAll tests passed.") exit(0) else: - print "\n\nSome tests failed. Review pep8 output above." + print("\n\nSome tests failed. Review pep8 output above.") exit(1) diff --git a/tools/yamllint.py b/tools/yamllint.py index ffba50f..99b46dc 100755 --- a/tools/yamllint.py +++ b/tools/yamllint.py @@ -13,6 +13,7 @@ directories and attempt to parse them using PyYAML. """ import argparse +import codecs import logging import os import sys @@ -45,15 +46,16 @@ logging.debug("Invoking yaml.safe_load_all on %s", full_path) try: files += 1 - yaml.safe_load(file(full_path, 'r')) + with codecs.open(full_path, 'r', 'utf-8') as f: + yaml.safe_load() logging.info('[PASS] ' + full_path) - except Exception, exc: + except Exception as exc: logging.error("Invalid file %s raised: %s", full_path, exc, exc_info=False) errors += 1 if errors == 0: - print "Good, all %s files passed!" % files + print("Good, all %s files passed!" % files) sys.exit(0) else: logging.error("Oh no, found %s files with errors out of %s files.", -- To view, visit https://gerrit.wikimedia.org/r/243092 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d5dd01b1253a49e9c7bb6963d8dab4ba5d22718 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins Gerrit-Branch: master Gerrit-Owner: John Vandenberg <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
