Ricordisamoa has uploaded a new change for review. https://gerrit.wikimedia.org/r/225825
Change subject: compat2core: use with statement instead of closing files manually ...................................................................... compat2core: use with statement instead of closing files manually Also close a file earlier in ConvertBot.warning() Change-Id: I56fd31f6080535edd00e60af93d816d6e7285b48 --- M scripts/maintenance/compat2core.py 1 file changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/25/225825/1 diff --git a/scripts/maintenance/compat2core.py b/scripts/maintenance/compat2core.py index fb9ef6c..176d705 100755 --- a/scripts/maintenance/compat2core.py +++ b/scripts/maintenance/compat2core.py @@ -24,6 +24,7 @@ """ # # (C) xqt, 2014 +# (C) Pywikibot team, 2015 # # Distributed under the terms of the MIT license. # @@ -155,23 +156,21 @@ exit() def convert(self): - f = codecs.open(self.source, "r", "utf-8") - text = f.read() - f.close() + with codecs.open(self.source, "r", "utf-8") as f: + text = f.read() for r in replacements: text = re.sub(r[0], r[1], text) - g = codecs.open(self.dest, "w", "utf-8") - g.write(text) - g.close() + with codecs.open(self.dest, "w", "utf-8") as g: + g.write(text) def warning(self): filename = self.source if self.warnonly else self.dest - g = codecs.open(filename, "r", "utf-8") - for i, line in enumerate(g, start=1): + with codecs.open(filename, "r", "utf-8") as g: + lines = enumerate(g.readlines(), start=1) + for i, line in lines: for w in warnings: if w[0] in line: pywikibot.warning(u'line %d: %s>>> %s\n' % (i, line, w[1])) - g.close() def main(): -- To view, visit https://gerrit.wikimedia.org/r/225825 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56fd31f6080535edd00e60af93d816d6e7285b48 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisa...@openmailbox.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits