Pywikibot-commits August 2016

pywikibot-commits@lists.wikimedia.org

2 participants
106 discussions

[Gerrit] pywikibot/core[master]: Search for scripts in maintenance folder too
by jenkins-bot (Code Review) 10 Aug '16

10 Aug '16

jenkins-bot has submitted this change and it was merged. Change subject: Search for scripts in maintenance folder too ...................................................................... Search for scripts in maintenance folder too - with 38ac04438664 scripts can be found in an archive folder but mainenance scripts must be started with preleading "maintenance/" - join paths in the right way; otherwise we could have mixed separators on windows os. - simplify test for existing script Change-Id: I02ed7a5e533eaa33c32cbd77a2c2bdcba567413c --- M pwb.py 1 file changed, 9 insertions(+), 11 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 395019e..060fea0 100755 --- a/pwb.py +++ b/pwb.py @@ -208,17 +208,15 @@ if not filename.endswith('.py'): filename += '.py' if not os.path.exists(filename): - testpath = os.path.join(os.path.split(__file__)[0], - 'scripts', - filename) - file_package = 'scripts' - if not os.path.exists(testpath): - testpath = os.path.join( - os.path.split(__file__)[0], 'scripts/archive', filename) - file_package = 'scripts.archive' - - if os.path.exists(testpath): - filename = testpath + script_paths = ['scripts', + 'scripts.maintenance', + 'scripts.archive'] + for file_package in script_paths: + paths = file_package.split('.') + [filename] + testpath = os.path.join(_pwb_dir, *paths) + if os.path.exists(testpath): + filename = testpath + break else: raise OSError("%s not found!" % filename) -- To view, visit https://gerrit.wikimedia.org/r/270279 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I02ed7a5e533eaa33c32cbd77a2c2bdcba567413c Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <Ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Update mw version number
by jenkins-bot (Code Review) 10 Aug '16

10 Aug '16

jenkins-bot has submitted this change and it was merged. Change subject: Update mw version number ...................................................................... Update mw version number Change-Id: I4ffce441cdbd2db56a4b7dc37b655f71c23fe0b5 --- M pywikibot/family.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved Dalba: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/family.py b/pywikibot/family.py index 2ad6c73..0bb5c09 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -1240,7 +1240,7 @@ Use L{pywikibot.tools.MediaWikiVersion} to compare version strings. """ # Here we return the latest mw release for downloading - return '1.26.3' + return '1.27.0' def force_version(self, code): """ -- To view, visit https://gerrit.wikimedia.org/r/303993 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ffce441cdbd2db56a4b7dc37b655f71c23fe0b5 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Use main account for checking user existence
by jenkins-bot (Code Review) 10 Aug '16

10 Aug '16

jenkins-bot has submitted this change and it was merged. Change subject: Use main account for checking user existence ...................................................................... Use main account for checking user existence When running a bot using a Special:BotPassword username but no provided password, use the main account username to check that the user exists before prompting for the password. For BotPasswords see https://www.mediawiki.org/wiki/Manual:Bot_passwords Bug: T142623 Change-Id: I2bf629b3f6b21f375cacdabc2518c7ac0cf3cd49 --- M pywikibot/login.py 1 file changed, 7 insertions(+), 4 deletions(-) Approvals: John Vandenberg: Looks good to me, approved Dalba: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/login.py b/pywikibot/login.py index df1152c..20f38f7 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -122,21 +122,24 @@ @raises NoUsername: Username doesnt exist in user list. """ + # convert any Special:BotPassword usernames to main account equivalent + main_username = self.username.partition('@')[0] + try: - data = self.site.allusers(start=self.username, total=1) + data = self.site.allusers(start=main_username, total=1) user = next(iter(data)) except pywikibot.data.api.APIError as e: if e.code == 'readapidenied': pywikibot.warning('Could not check user %s exists on %s' - % (self.username, self.site)) + % (main_username, self.site)) return else: raise - if user['name'] != self.username: + if user['name'] != main_username: # Report the same error as server error code NotExists raise NoUsername('Username \'%s\' does not exist on %s' - % (self.username, self.site)) + % (main_username, self.site)) def botAllowed(self): """ -- To view, visit https://gerrit.wikimedia.org/r/304060 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2bf629b3f6b21f375cacdabc2518c7ac0cf3cd49 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[2.0]: setup.py: Add Python 3.4 and 3.5 to pypi classifiers
by jenkins-bot (Code Review) 09 Aug '16

09 Aug '16

jenkins-bot has submitted this change and it was merged. Change subject: setup.py: Add Python 3.4 and 3.5 to pypi classifiers ...................................................................... setup.py: Add Python 3.4 and 3.5 to pypi classifiers Change-Id: I17fbde4172a5cd380c25b7f781a2a122f9313549 (cherry picked from commit b6e02407d8d1afde3c9df831f9bacb4a5a9f0e6e) --- M setup.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index 397dac1..265a915 100644 --- a/setup.py +++ b/setup.py @@ -188,6 +188,8 @@ 'Environment :: Console', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', ], use_2to3=False ) -- To view, visit https://gerrit.wikimedia.org/r/303983 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17fbde4172a5cd380c25b7f781a2a122f9313549 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: 2.0 Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: setup.py: Add Python 3.4 and 3.5 to pypi classifiers
by jenkins-bot (Code Review) 09 Aug '16

09 Aug '16

jenkins-bot has submitted this change and it was merged. Change subject: setup.py: Add Python 3.4 and 3.5 to pypi classifiers ...................................................................... setup.py: Add Python 3.4 and 3.5 to pypi classifiers Change-Id: I17fbde4172a5cd380c25b7f781a2a122f9313549 --- M setup.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/setup.py b/setup.py index c880ec4..2ff038e 100644 --- a/setup.py +++ b/setup.py @@ -218,6 +218,8 @@ 'Environment :: Console', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', ], use_2to3=False ) -- To view, visit https://gerrit.wikimedia.org/r/303979 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I17fbde4172a5cd380c25b7f781a2a122f9313549 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: tests/family_tests: test should pass when domain is 'localho...
by jenkins-bot (Code Review) 09 Aug '16

09 Aug '16

jenkins-bot has submitted this change and it was merged. Change subject: tests/family_tests: test should pass when domain is 'localhost:4881' ...................................................................... tests/family_tests: test should pass when domain is 'localhost:4881' Change-Id: Icda9ffc9f845deb0d0b0f284682a57d7b606e274 --- M tests/family_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/family_tests.py b/tests/family_tests.py index 440f249..1b536f1 100644 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -43,7 +43,7 @@ self.assertTrue(iter(f.domains)) for domain in f.domains: self.assertIsInstance(domain, basestring) - if domain != 'localhost': + if domain.split(':', 1)[0] != 'localhost': self.assertIn('.', domain) self.assertEqual(f.name, name) self.assertIsInstance(f.languages_by_size, list) -- To view, visit https://gerrit.wikimedia.org/r/293958 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icda9ffc9f845deb0d0b0f284682a57d7b606e274 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Whym <whym(a)whym.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Bugfixes for XMLDumpOldPageGenerator
by jenkins-bot (Code Review) 09 Aug '16

09 Aug '16

jenkins-bot has submitted this change and it was merged. Change subject: [bugfix] Bugfixes for XMLDumpOldPageGenerator ...................................................................... [bugfix] Bugfixes for XMLDumpOldPageGenerator pagegenerators.py - rename self.xmlStart to self.start and use properties for the deprecated instance variable - start parameter may be a prefix instead an existing page title. Skip all previous titles. - solve underlines inside start parameter - resolve namespaces parameter - don't assign a constructor parameter to a local variable. Use it directly. - self.namespaces is never a empty list anymore reflinks.py - handle -namespace option by pagegenerators.GeneratorFactory - predefine xmlStart reflinks_tests.py - remove expectedFailure decorators from test which are solved now Bug: T100524 Bug: T132663 Change-Id: I171f10165a321ae693ed939ed649e676e4b0e0de --- M pywikibot/pagegenerators.py M scripts/reflinks.py M tests/reflinks_tests.py 3 files changed, 54 insertions(+), 35 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 6ce7417..e4bc8da 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -2517,26 +2517,61 @@ class XMLDumpOldPageGenerator(IteratorNextMixin): - """Xml generator that yields Page objects with old text loaded.""" + """ + Xml generator that yields Page objects with old text loaded. + + @param filename: filename of XML dump + @type filename: str + @param start: skip entries below that value + @type start: str or None + @param namespaces: namespace filter + @type identifiers: iterable of basestring or Namespace key, + or a single instance of those types + @param site: current site for the generator + @type site: pywikibot.Site or None + @param text_predicate: a callable with entry.text as parameter and boolean + as result to indicate the generator should return the page or not + @type text_predicate: function identifier or None + + @ivar text_predicate: holds text_predicate function + @ivar skipping: True if start parameter is given, else False + @ivar start: holds start parameter + @ivar namespaces: holds namespaces filter + @ivar parser: holds the xmlreader.XmlDump parse method + """ @deprecated_args(xmlFilename='filename', xmlStart='start') - def __init__(self, filename, start=None, namespaces=[], site=None, + def __init__(self, filename, start=None, namespaces=None, site=None, text_predicate=None): """Constructor.""" - # xmlFilename and xmlStart mapped to not break git blame - # use filename and start on new/changed lines - xmlFilename = filename - xmlStart = start - self.text_predicate = text_predicate - self.xmlStart = xmlStart - self.namespaces = namespaces - self.skipping = bool(xmlStart) - self.site = site or pywikibot.Site() + self.skipping = bool(start) + if self.skipping: + self.start = start.replace('_', ' ') + else: + self.start = None - dump = xmlreader.XmlDump(xmlFilename) + self.site = site or pywikibot.Site() + if not namespaces: + self.namespaces = self.site.namespaces + else: + self.namespaces = self.site.namespaces.resolve(namespaces) + + dump = xmlreader.XmlDump(filename) self.parser = dump.parse() + + @property + @deprecated('self.start') + def xmlStart(self): + """Getter for deprecated xmlStart instance variable.""" + return self.start + + @xmlStart.setter + @deprecated('self.start') + def xmlStart(self, value): + """Setter for deprecated xmlStart instance variable.""" + self.start = value def __next__(self): """Get next Page.""" @@ -2546,13 +2581,12 @@ except StopIteration: raise if self.skipping: - if entry.title != self.xmlStart: + if entry.title < self.start: continue self.skipping = False page = pywikibot.Page(self.site, entry.title) - if not self.namespaces == []: - if page.namespace() not in self.namespaces: - continue + if page.namespace() not in self.namespaces: + continue if not self.text_predicate or self.text_predicate(entry.text): page.text = entry.text return page diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 0072ec0..c5daf1d 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -746,8 +746,8 @@ @type args: list of unicode """ xmlFilename = None + xmlStart = None options = {} - namespaces = [] generator = None # Process global args and prepare generator args parser @@ -755,12 +755,7 @@ genFactory = pagegenerators.GeneratorFactory() for arg in local_args: - if arg.startswith('-namespace:'): - try: - namespaces.append(int(arg[11:])) - except ValueError: - namespaces.append(arg[11:]) - elif arg.startswith('-summary:'): + if arg.startswith('-summary:'): options['summary'] = arg[9:] elif arg == '-always': options['always'] = True @@ -784,11 +779,8 @@ genFactory.handleArg(arg) if xmlFilename: - try: - xmlStart - except NameError: - xmlStart = None - generator = XmlDumpPageGenerator(xmlFilename, xmlStart, namespaces) + generator = XmlDumpPageGenerator(xmlFilename, xmlStart, + genFactory.namespaces) if not generator: generator = genFactory.getCombinedGenerator() if not generator: diff --git a/tests/reflinks_tests.py b/tests/reflinks_tests.py index ac5f6f5..56611f3 100644 --- a/tests/reflinks_tests.py +++ b/tests/reflinks_tests.py @@ -56,7 +56,6 @@ self.assertPagelistTitles(pages, (u'Fake page', u'Talk:Fake page'), site=self.get_site()) - @unittest.expectedFailure def test_namespace_None(self): """Test namespaces=None processes all namespaces.""" gen = XmlDumpPageGenerator( @@ -68,7 +67,6 @@ self.assertPagelistTitles(pages, (u'Fake page', u'Talk:Fake page'), site=self.get_site()) - @unittest.expectedFailure def test_namespace_string_ids(self): """Test namespaces with ids as string.""" gen = XmlDumpPageGenerator( @@ -91,7 +89,6 @@ self.assertPagelistTitles(pages, (u'Talk:Fake page', ), site=self.get_site()) - @unittest.expectedFailure def test_start_with_underscore(self): """Test with underscore in start page title.""" gen = XmlDumpPageGenerator( @@ -114,7 +111,6 @@ self.assertPagelistTitles(pages, (u'Fake page', u'Talk:Fake page'), site=self.get_site()) - @unittest.expectedFailure def test_start_prefix(self): """Test with a prefix as a start page title.""" gen = XmlDumpPageGenerator( @@ -178,7 +174,6 @@ self.assertPageTitlesCountEqual(gen, [u'Fake page', u'Talk:Fake page'], site=self.get_site()) - @unittest.expectedFailure def test_xml_multiple_namespace_ids_2(self): """Test the generator using multiple namespaces in one parameter.""" main('-xml:' + join_xml_data_path('dummy-reflinks.xml'), @@ -187,7 +182,6 @@ self.assertPageTitlesCountEqual(gen, [u'Fake page', u'Talk:Fake page'], site=self.get_site()) - @unittest.expectedFailure def test_xml_start_prefix(self): """Test the generator using a start partial page.""" main('-xml:' + join_xml_data_path('dummy-reflinks.xml'), @@ -197,7 +191,6 @@ self.assertPagelistTitles(pages, [u'Talk:Fake page'], site=self.get_site()) - @unittest.expectedFailure def test_xml_start_underscore(self): """Test the generator using a start page with an underscore.""" main('-xml:' + join_xml_data_path('dummy-reflinks.xml'), -- To view, visit https://gerrit.wikimedia.org/r/283401 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I171f10165a321ae693ed939ed649e676e4b0e0de Gerrit-PatchSet: 7 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [flake8] Check PEP-8 naming conventions
by jenkins-bot (Code Review) 09 Aug '16

09 Aug '16

jenkins-bot has submitted this change and it was merged. Change subject: [flake8] Check PEP-8 naming conventions ...................................................................... [flake8] Check PEP-8 naming conventions - no abbreviation when importing Timestamp or MediaWikiVersion Change-Id: Id0c12977992e4284a0709454e9060b475c81ffdc --- M pywikibot/proofreadpage.py M pywikibot/tools/ip.py M pywikibot/userinterfaces/gui.py M scripts/maintenance/make_i18n_dict.py M scripts/revertbot.py M tests/mediawikiversion_tests.py M tests/replacebot_tests.py M tests/timestamp_tests.py M tox.ini 9 files changed, 53 insertions(+), 40 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index 4fdba01..306bd74 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -202,7 +202,7 @@ return self._quality return self.ql - def decompose(fn): + def decompose(fn): # flake8: disable=N805 """Decorator. Decompose text if needed and recompose text. @@ -499,7 +499,7 @@ self._cached = False - def check_if_cached(fn): + def check_if_cached(fn): # flake8: disable=N805 """Decorator to check if data are cached and cache them if needed.""" def wrapper(self, *args, **kwargs): if self._cached is False: diff --git a/pywikibot/tools/ip.py b/pywikibot/tools/ip.py index aca5045..675eed8 100644 --- a/pywikibot/tools/ip.py +++ b/pywikibot/tools/ip.py @@ -33,7 +33,7 @@ else: _ipaddr_version = StrictVersion(_ipaddr_version) if _ipaddr_version >= StrictVersion('2.1.10'): - from ipaddr import IPAddress as ip_address + from ipaddr import IPAddress as ip_address # flake8: disable=N813 else: _ipaddr_e = ImportError('ipaddr %s is broken.' % _ipaddr_version) diff --git a/pywikibot/userinterfaces/gui.py b/pywikibot/userinterfaces/gui.py index 4d3e33e..454c005 100644 --- a/pywikibot/userinterfaces/gui.py +++ b/pywikibot/userinterfaces/gui.py @@ -22,7 +22,7 @@ if sys.version_info[0] > 2: import tkinter as Tkinter from tkinter.scrolledtext import ScrolledText - from tkinter import simpledialog as tkSimpleDialog + from tkinter import simpledialog as tkSimpleDialog # flake8: disable=N812 else: import Tkinter import tkSimpleDialog diff --git a/scripts/maintenance/make_i18n_dict.py b/scripts/maintenance/make_i18n_dict.py index 16edd6a..c73f055 100755 --- a/scripts/maintenance/make_i18n_dict.py +++ b/scripts/maintenance/make_i18n_dict.py @@ -43,7 +43,7 @@ from pywikibot import config -class i18nBot(object): +class i18nBot(object): # flake8: disable=N801 """I18n bot.""" diff --git a/scripts/revertbot.py b/scripts/revertbot.py index 836ef5a..0022ef9 100755 --- a/scripts/revertbot.py +++ b/scripts/revertbot.py @@ -141,7 +141,7 @@ pywikibot.output(msg) -class myRevertBot(BaseRevertBot): +class RevertBot(BaseRevertBot): """Example revert bot.""" @@ -161,6 +161,9 @@ return False +myRevertBot = RevertBot # for compatibility only + + def main(*args): """ Process command line arguments and invoke bot. diff --git a/tests/mediawikiversion_tests.py b/tests/mediawikiversion_tests.py index 4abb82b..e387928 100644 --- a/tests/mediawikiversion_tests.py +++ b/tests/mediawikiversion_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for the tools.MediaWikiVersion class.""" # -# (C) Pywikibot team, 2008-2014 +# (C) Pywikibot team, 2008-2016 # # Distributed under the terms of the MIT license. # @@ -10,7 +10,7 @@ __version__ = '$Id$' -from pywikibot.tools import MediaWikiVersion as V +from pywikibot.tools import MediaWikiVersion from tests.aspects import unittest, TestCase @@ -23,7 +23,7 @@ def _make(self, version): """Create a MediaWikiVersion instance and check that the str stays.""" - v = V(version) + v = MediaWikiVersion(version) self.assertEqual(str(v), version) return v @@ -74,17 +74,18 @@ def test_invalid_versions(self): """Verify that insufficient version fail creating.""" - self.assertRaises(ValueError, V, 'invalid') - self.assertRaises(ValueError, V, '1number') - self.assertRaises(ValueError, V, '1.missing') + self.assertRaises(ValueError, MediaWikiVersion, 'invalid') + self.assertRaises(ValueError, MediaWikiVersion, '1number') + self.assertRaises(ValueError, MediaWikiVersion, '1.missing') - self.assertRaises(AssertionError, V, '1.23wmf-1') + self.assertRaises(AssertionError, MediaWikiVersion, '1.23wmf-1') def test_generator(self): """Test from_generator classmethod.""" - self.assertEqual(V.from_generator('MediaWiki 1.2.3'), + self.assertEqual(MediaWikiVersion.from_generator('MediaWiki 1.2.3'), self._make('1.2.3')) - self.assertRaises(ValueError, V.from_generator, 'Invalid 1.2.3') + self.assertRaises(ValueError, MediaWikiVersion.from_generator, + 'Invalid 1.2.3') if __name__ == '__main__': # pragma: no cover diff --git a/tests/replacebot_tests.py b/tests/replacebot_tests.py index e062477..60ac7ef 100644 --- a/tests/replacebot_tests.py +++ b/tests/replacebot_tests.py @@ -45,14 +45,14 @@ changed_pages = -42 # show that weird number to show this was used - def __init__(inner_self, *args, **kwargs): + def __init__(inner_self, *args, **kwargs): # flake8: disable=N805 # Unpatch already here, as otherwise super calls will use # this class' super which is the class itself replace.ReplaceRobot = self._original_bot super(FakeReplaceBot, inner_self).__init__(*args, **kwargs) self.bots.append(inner_self) - def run(inner_self): + def run(inner_self): # flake8: disable=N805 """Nothing to do here.""" inner_self.changed_pages = -47 # show that run was called diff --git a/tests/timestamp_tests.py b/tests/timestamp_tests.py index 5d6eb9d..f970a8d 100644 --- a/tests/timestamp_tests.py +++ b/tests/timestamp_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for the Timestamp class.""" # -# (C) Pywikibot team, 2014 +# (C) Pywikibot team, 2014-2016 # # Distributed under the terms of the MIT license. # @@ -12,7 +12,7 @@ import calendar import datetime -from pywikibot import Timestamp as T +from pywikibot import Timestamp from tests.aspects import unittest, TestCase @@ -25,26 +25,26 @@ def test_clone(self): """Test cloning a Timestamp instance.""" - t1 = T.utcnow() + t1 = Timestamp.utcnow() t2 = t1.clone() self.assertEqual(t1, t2) - self.assertIsInstance(t2, T) + self.assertIsInstance(t2, Timestamp) def test_instantiate_from_instance(self): """Test passing instance to factory methods works.""" - t1 = T.utcnow() - self.assertIsNot(t1, T.fromISOformat(t1)) - self.assertEqual(t1, T.fromISOformat(t1)) - self.assertIsInstance(T.fromISOformat(t1), T) - self.assertIsNot(t1, T.fromtimestampformat(t1)) - self.assertEqual(t1, T.fromtimestampformat(t1)) - self.assertIsInstance(T.fromtimestampformat(t1), T) + t1 = Timestamp.utcnow() + self.assertIsNot(t1, Timestamp.fromISOformat(t1)) + self.assertEqual(t1, Timestamp.fromISOformat(t1)) + self.assertIsInstance(Timestamp.fromISOformat(t1), Timestamp) + self.assertIsNot(t1, Timestamp.fromtimestampformat(t1)) + self.assertEqual(t1, Timestamp.fromtimestampformat(t1)) + self.assertIsInstance(Timestamp.fromtimestampformat(t1), Timestamp) def test_iso_format(self): """Test conversion from and to ISO format.""" - t1 = T.utcnow() + t1 = Timestamp.utcnow() ts1 = t1.isoformat() - t2 = T.fromISOformat(ts1) + t2 = Timestamp.fromISOformat(ts1) ts2 = t2.isoformat() # MediaWiki ISO format doesn't include microseconds self.assertNotEqual(t1, t2) @@ -54,9 +54,9 @@ def test_mediawiki_format(self): """Test conversion from and to timestamp format.""" - t1 = T.utcnow() + t1 = Timestamp.utcnow() ts1 = t1.totimestampformat() - t2 = T.fromtimestampformat(ts1) + t2 = Timestamp.fromtimestampformat(ts1) ts2 = t2.totimestampformat() # MediaWiki timestamp format doesn't include microseconds self.assertNotEqual(t1, t2) @@ -66,13 +66,13 @@ def test_add_timedelta(self): """Test addin a timedelta to a Timestamp.""" - t1 = T.utcnow() + t1 = Timestamp.utcnow() t2 = t1 + datetime.timedelta(days=1) if t1.month != t2.month: self.assertEqual(1, t2.day) else: self.assertEqual(t1.day + 1, t2.day) - self.assertIsInstance(t2, T) + self.assertIsInstance(t2, Timestamp) def test_add_timedate(self): """Test unsupported additions raise NotImplemented.""" @@ -82,24 +82,24 @@ self.assertIs(t3, NotImplemented) # Now check that the pywikibot sub-class behaves the same way - t1 = T.utcnow() + t1 = Timestamp.utcnow() t2 = t1 + datetime.timedelta(days=1) t3 = t1.__add__(t2) self.assertIs(t3, NotImplemented) def test_sub_timedelta(self): """Test substracting a timedelta from a Timestamp.""" - t1 = T.utcnow() + t1 = Timestamp.utcnow() t2 = t1 - datetime.timedelta(days=1) if t1.month != t2.month: self.assertEqual(calendar.monthrange(t2.year, t2.month)[1], t2.day) else: self.assertEqual(t1.day - 1, t2.day) - self.assertIsInstance(t2, T) + self.assertIsInstance(t2, Timestamp) def test_sub_timedate(self): """Test subtracting two timestamps.""" - t1 = T.utcnow() + t1 = Timestamp.utcnow() t2 = t1 - datetime.timedelta(days=1) td = t1 - t2 self.assertIsInstance(td, datetime.timedelta) diff --git a/tox.ini b/tox.ini index e87318d..83ce047 100644 --- a/tox.ini +++ b/tox.ini @@ -63,6 +63,7 @@ flake8-tuple>=0.2.8 flake8-print>=2.0.1 git+https://github.com/jayvdb/flake8-mock@use-ascii-readme + pep8-naming [testenv:nose] commands = @@ -128,8 +129,9 @@ # D103: Missing docstring in public function # E402: module level import not at top of file; see T87409 # H201: Except: format +# N802, N803, N806 : naming convention # P102,P103: string does contain unindexed parameters; see I36355923 -ignore = C401,C402,C405,E402,D105,D211,FI10,FI12,FI13,FI15,FI16,FI17,FI5,H101,H201,H236,H301,H404,H405,I100,I101 +ignore = C401,C402,C405,E402,D105,D211,FI10,FI12,FI13,FI15,FI16,FI17,FI5,H101,H201,H236,H301,H404,H405,I100,I101,N802,N803,N806 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* min-version = 2.6 max_line_length = 100 @@ -140,19 +142,26 @@ generate_family_file.py : +T001, T003 pwb.py : +T001, T003 pywikibot/date.py,pywikibot/family.py,pywikibot/fixes.py,pywikibot/textlib.py,pywikibot/userinterfaces/terminal_interface_unix.py,pywikibot/userinterfaces/terminal_interface_win32.py,pywikibot/families/wikipedia_family.py : +E241 + pywikibot/textlib.py : +N801 + pywikibot/userinterfaces/transliteration.py : +N801 + pywikibot/userinterfaces/win32_unicode.py : +N801, N812 tests/page_tests.py : +E241 scripts/,/pagegenerators.parameterHelp/ : +E241 scripts/blockreview.py,scripts/imagetransfer.py,scripts/interwiki.py,scripts/maintenance/wikimedia_sites.py : +E241 - tests/ui_tests.py : +D102, D103 + tests/ui_tests.py : +D102, D103, N801 tests/__init__.py,tests/aspects.py,tests/script_tests.py,tests/site_detect_tests.py : +T001, T003 tests/pwb/ : +T001, T003 + tests/,/from pywikibot.tools import/ : +N813 scripts/imagetransfer.py : +T001, T003 + scripts/checkimages.py,scripts/imagecopy.py,scripts/imagecopy_self.py : +N801 scripts/maintenance/make_i18n_dict.py : +T001, T003 scripts/archive/featured.py : +D102, D103 scripts/script_wui.py : +D102 scripts/makecat.py : +D103 scripts/interwiki.py,/""/ : +P102 pywikibot/__init__.py,/link_regex/ : +P103 + # valid N805 naming convention exceptions + pywikibot/userinterfaces/terminal_interface.py,/from pywikibot.userinterfaces.terminal_interface_.* import .* as UI/ : +N814 # invalidly detected as {} format string: tests/textlib_tests.py,/self.assert.*{{/ : +P103 # __dict__ used in a discouraged manner -- To view, visit https://gerrit.wikimedia.org/r/303407 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id0c12977992e4284a0709454e9060b475c81ffdc Gerrit-PatchSet: 12 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: Add sq.wikipedia commonscat mapping
by jenkins-bot (Code Review) 09 Aug '16

09 Aug '16

jenkins-bot has submitted this change and it was merged. Change subject: Add sq.wikipedia commonscat mapping ...................................................................... Add sq.wikipedia commonscat mapping Change-Id: I5d6a0c48c46edb154e4d417527d0bcd59f93ce33 --- M scripts/commonscat.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/commonscat.py b/scripts/commonscat.py index a9ee7d8..6e78034 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -143,6 +143,7 @@ 'sl': (u'Kategorija v Zbirki', [u'Commonscat', u'Kategorija v zbirki', u'Commons cat', u'Katzbirke']), + 'sq': (u'Commonscat', [u'Commonskat', u'Commonsart', u'CommonsCat']), 'sv': (u'Commonscat', [u'Commonscat-rad', u'Commonskat', u'Commons cat', u'Commonscatbox', u'Commonscat-box']), -- To view, visit https://gerrit.wikimedia.org/r/303791 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d6a0c48c46edb154e4d417527d0bcd59f93ce33 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] pywikibot/core[master]: [flake8] Use flake8-comprehensions
by jenkins-bot (Code Review) 09 Aug '16

09 Aug '16

jenkins-bot has submitted this change and it was merged. Change subject: [flake8] Use flake8-comprehensions ...................................................................... [flake8] Use flake8-comprehensions Change-Id: I77feb4036cb670d19e1bbbd6ea461fa858566901 --- M generate_family_file.py M pywikibot/data/api.py M pywikibot/date.py M pywikibot/page.py M pywikibot/tools/__init__.py M pywikibot/tools/formatter.py M pywikibot/version.py M scripts/casechecker.py M scripts/checkimages.py M scripts/data_ingestion.py M scripts/protect.py M tests/archivebot_tests.py M tox.ini 13 files changed, 55 insertions(+), 57 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_family_file.py b/generate_family_file.py index ddfe809..5505b69 100755 --- a/generate_family_file.py +++ b/generate_family_file.py @@ -9,7 +9,7 @@ print_function, unicode_literals) # # (C) Merlijn van Deen, 2010-2013 -# (C) Pywikibot team, 2010-2015 +# (C) Pywikibot team, 2010-2016 # # Distributed under the terms of the MIT license # @@ -81,7 +81,7 @@ print("Determining other languages...", end="") try: self.langs = w.langs - print(u' '.join(sorted([wiki[u'prefix'] for wiki in self.langs]))) + print(' '.join(sorted(wiki['prefix'] for wiki in self.langs))) except Exception as e: self.langs = [] print(e, "; continuing...") diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 66c9aec..c3d95e8 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Interface to Mediawiki's api.php.""" # -# (C) Pywikibot team, 2007-2015 +# (C) Pywikibot team, 2007-2016 # # Distributed under the terms of the MIT license. # @@ -1049,8 +1049,8 @@ if not self._with_limits: self.fetch(self.submodules('query', True)) self._with_limits = frozenset( - [mod for mod in self.query_modules - if self.parameter('query+' + mod, 'limit')]) + mod for mod in self.query_modules + if self.parameter('query+' + mod, 'limit')) return self._with_limits @@ -1907,8 +1907,8 @@ modules = set([self.action]) if modules: self.site._paraminfo.fetch(modules) - use_get = all(['mustbeposted' not in self.site._paraminfo[mod] - for mod in modules]) + use_get = all('mustbeposted' not in self.site._paraminfo[mod] + for mod in modules) else: # If modules is empty, just 'meta' was given, which doesn't # require POSTs, and is required for ParamInfo diff --git a/pywikibot/date.py b/pywikibot/date.py index 0592896..c3cb04c 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -7,7 +7,7 @@ # (C) Andre Engels, 2004-2005 # (C) Yuri Astrakhan, 2005-2006 (<Firstname><Lastname>@gmail.com) # (years/decades/centuries/millenniums str <=> int conversions) -# (C) Pywikibot team, 2004-2015 +# (C) Pywikibot team, 2004-2016 # # Distributed under the terms of the MIT license. # @@ -263,28 +263,28 @@ # Helper for KN: digits representation _knDigits = u'೦೧೨೩೪೫೬೭೮೯' -_knDigitsToLocal = dict([(ord(unicode(i)), _knDigits[i]) for i in range(10)]) -_knLocalToDigits = dict([(ord(_knDigits[i]), unicode(i)) for i in range(10)]) +_knDigitsToLocal = dict((ord(unicode(i)), _knDigits[i]) for i in range(10)) +_knLocalToDigits = dict((ord(_knDigits[i]), unicode(i)) for i in range(10)) # Helper for Urdu/Persian languages _faDigits = u'۰۱۲۳۴۵۶۷۸۹' -_faDigitsToLocal = dict([(ord(unicode(i)), _faDigits[i]) for i in range(10)]) -_faLocalToDigits = dict([(ord(_faDigits[i]), unicode(i)) for i in range(10)]) +_faDigitsToLocal = dict((ord(unicode(i)), _faDigits[i]) for i in range(10)) +_faLocalToDigits = dict((ord(_faDigits[i]), unicode(i)) for i in range(10)) # Helper for HI:, MR: _hiDigits = u'०१२३४५६७८९' -_hiDigitsToLocal = dict([(ord(unicode(i)), _hiDigits[i]) for i in range(10)]) -_hiLocalToDigits = dict([(ord(_hiDigits[i]), unicode(i)) for i in range(10)]) +_hiDigitsToLocal = dict((ord(unicode(i)), _hiDigits[i]) for i in range(10)) +_hiLocalToDigits = dict((ord(_hiDigits[i]), unicode(i)) for i in range(10)) # Helper for BN: _bnDigits = u'০১২৩৪৫৬৭৮৯' -_bnDigitsToLocal = dict([(ord(unicode(i)), _bnDigits[i]) for i in range(10)]) -_bnLocalToDigits = dict([(ord(_bnDigits[i]), unicode(i)) for i in range(10)]) +_bnDigitsToLocal = dict((ord(unicode(i)), _bnDigits[i]) for i in range(10)) +_bnLocalToDigits = dict((ord(_bnDigits[i]), unicode(i)) for i in range(10)) # Helper for GU: _guDigits = u'૦૧૨૩૪૫૬૭૮૯' -_guDigitsToLocal = dict([(ord(unicode(i)), _guDigits[i]) for i in range(10)]) -_guLocalToDigits = dict([(ord(_guDigits[i]), unicode(i)) for i in range(10)]) +_guDigitsToLocal = dict((ord(unicode(i)), _guDigits[i]) for i in range(10)) +_guLocalToDigits = dict((ord(_guDigits[i]), unicode(i)) for i in range(10)) def intToLocalDigitsStr(value, digitsToLocalDict): diff --git a/pywikibot/page.py b/pywikibot/page.py index 5c5f2e0..4a7f1b9 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1958,7 +1958,7 @@ warn(u'"unprotect" argument of protect() is deprecated', DeprecationWarning, 2) protections = dict( - [(p_type, "") for p_type in self.applicable_protections()]) + (p_type, "") for p_type in self.applicable_protections()) answer = 'y' if called_using_deprecated_arg and prompt is None: prompt = True @@ -2160,7 +2160,7 @@ """ # WARNING: may not return all templates used in particularly # intricate cases such as template substitution - titles = list(t.title() for t in self.templates()) + titles = [t.title() for t in self.templates()] templates = textlib.extract_templates_and_params(self.text) # backwards-compatibility: convert the dict returned as the second # element into a list in the format used by old scripts diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 40f7320..e1642dd 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -560,8 +560,8 @@ def run(self): """Run the generator and store the results on the queue.""" - iterable = any([hasattr(self.generator, key) - for key in ['__iter__', '__getitem__']]) + iterable = any(hasattr(self.generator, key) + for key in ('__iter__', '__getitem__')) if iterable and not self.args and not self.kwargs: self.__gen = self.generator else: diff --git a/pywikibot/tools/formatter.py b/pywikibot/tools/formatter.py index c53d80a..47f6762 100644 --- a/pywikibot/tools/formatter.py +++ b/pywikibot/tools/formatter.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Module containing various formatting related utilities.""" # -# (C) Pywikibot team, 2015 +# (C) Pywikibot team, 2015-2016 # # Distributed under the terms of the MIT license. # @@ -70,7 +70,7 @@ colors = set(colors) # Dot.product of colors to create all possible combinations of foreground # and background colors. - colors |= set(['%s;%s' % (c1, c2) for c1 in colors for c2 in colors]) + colors |= set('%s;%s' % (c1, c2) for c1 in colors for c2 in colors) def __init__(self): """Create new instance and store the stack depth.""" diff --git a/pywikibot/version.py b/pywikibot/version.py index 93b13af..bd4d841 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -483,12 +483,11 @@ std_lib_dir = get_python_lib(standard_lib=True) - root_packages = set([key.split('.')[0] - for key in modules]) + root_packages = set(key.split('.')[0] for key in modules) - builtin_packages = set([name.split('.')[0] for name in root_packages - if name in sys.builtin_module_names or - '_' + name in sys.builtin_module_names]) + builtin_packages = set(name.split('.')[0] for name in root_packages + if name in sys.builtin_module_names or + '_' + name in sys.builtin_module_names) # Improve performance by removing builtins from the list if possible. if builtins is False: diff --git a/scripts/casechecker.py b/scripts/casechecker.py index 1daccca..925e0a9 100755 --- a/scripts/casechecker.py +++ b/scripts/casechecker.py @@ -172,22 +172,20 @@ self.titleList = [self.Page(t) for t in f] self.failedTitles += '.failed' - self.lclToLatDict = dict([(ord(self.localSuspects[i]), - self.latinSuspects[i]) - for i in xrange(len(self.localSuspects))]) - self.latToLclDict = dict([(ord(self.latinSuspects[i]), - self.localSuspects[i]) - for i in xrange(len(self.localSuspects))]) + self.lclToLatDict = dict( + (ord(self.localSuspects[i]), self.latinSuspects[i]) + for i in xrange(len(self.localSuspects))) + self.latToLclDict = dict( + (ord(self.latinSuspects[i]), self.localSuspects[i]) + for i in xrange(len(self.localSuspects))) if self.localKeyboard is not None: self.lclToLatKeybDict = dict( - [(ord(self.localKeyboard[i]), - self.latinKeyboard[i]) - for i in xrange(len(self.localKeyboard))]) + (ord(self.localKeyboard[i]), self.latinKeyboard[i]) + for i in xrange(len(self.localKeyboard))) self.latToLclKeybDict = dict( - [(ord(self.latinKeyboard[i]), - self.localKeyboard[i]) - for i in xrange(len(self.localKeyboard))]) + (ord(self.latinKeyboard[i]), self.localKeyboard[i]) + for i in xrange(len(self.localKeyboard))) else: self.lclToLatKeybDict = {} self.latToLclKeybDict = {} @@ -467,9 +465,9 @@ badWords = list(self.FindBadWords(title)) if len(badWords) > 0: # Allow known words, allow any roman numerals with local suffixes - badWords = set([i for i in badWords - if i not in self.knownWords and - self.romanNumSfxPtrn.match(i) is not None]) + badWords = set(i for i in badWords + if i not in self.knownWords and + self.romanNumSfxPtrn.match(i) is not None) if len(badWords) == 0 or self.Page(title).isImage(): return diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 02e9a0b..e8df222 100755 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -548,8 +548,8 @@ self.com = i18n.translate(self.site, msg_comm10, fallback=True) hiddentemplatesRaw = i18n.translate(self.site, HiddenTemplate) self.hiddentemplates = set( - [pywikibot.Page(self.site, tmp, ns=self.site.namespaces.TEMPLATE) - for tmp in hiddentemplatesRaw]) + pywikibot.Page(self.site, tmp, ns=self.site.namespaces.TEMPLATE) + for tmp in hiddentemplatesRaw) self.pageHidden = i18n.translate(self.site, PageWithHiddenTemplates) self.pageAllowed = i18n.translate(self.site, PageWithAllowedTemplates) self.comment = i18n.twtranslate(self.site.lang, diff --git a/scripts/data_ingestion.py b/scripts/data_ingestion.py index 40516cf..836d1af 100755 --- a/scripts/data_ingestion.py +++ b/scripts/data_ingestion.py @@ -8,7 +8,7 @@ python pwb.py data_ingestion -csvdir:local_dir/ -page:config_page """ # -# (C) Pywikibot team, 2013 +# (C) Pywikibot team, 2013-2016 # # Distributed under the terms of the MIT license. # @@ -105,9 +105,8 @@ """ hashObject = hashlib.sha1() hashObject.update(self.downloadPhoto().getvalue()) - return list( - page.title(withNamespace=False) for page in - self.site.allimages(sha1=base64.b16encode(hashObject.digest()))) + return [page.title(withNamespace=False) for page in + self.site.allimages(sha1=base64.b16encode(hashObject.digest()))] def getTitle(self, fmt): """ diff --git a/scripts/protect.py b/scripts/protect.py index 222f19e..4441241 100755 --- a/scripts/protect.py +++ b/scripts/protect.py @@ -235,8 +235,8 @@ protection_levels) # set the default value for all # None (not the string 'none') will be ignored by Site.protect() - combined_protections = dict([ - (p_type, default_level) for p_type in protection_types]) + combined_protections = dict( + (p_type, default_level) for p_type in protection_types) for p_type, level in protections.items(): level = check_protection_level(p_type, level, protection_levels, default_level) diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index 4cf2e43..467c4c1 100644 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -40,8 +40,8 @@ """Test archivebot script on 40+ Wikipedia sites.""" family = 'wikipedia' - sites = dict([(code, {'family': 'wikipedia', 'code': code}) - for code in THREADS]) + sites = dict((code, {'family': 'wikipedia', 'code': code}) + for code in THREADS) cached = True @@ -107,8 +107,8 @@ """ family = 'wikipedia' - sites = dict([(code, {'family': 'wikipedia', 'code': code}) - for code in THREADS_WITH_UPDATED_FORMAT]) + sites = dict((code, {'family': 'wikipedia', 'code': code}) + for code in THREADS_WITH_UPDATED_FORMAT) cached = True diff --git a/tox.ini b/tox.ini index 10956ef..e87318d 100644 --- a/tox.ini +++ b/tox.ini @@ -56,6 +56,7 @@ flake8-docstrings>=0.2.6 flake8-putty>=0.3.2 flake8-coding + flake8-comprehensions flake8-future-import flake8-string-format flake8-import-order @@ -122,12 +123,13 @@ # H301,I100,I101: import order rules; Pywikibot uses rules H306 and I201 # The following are to be fixed +# C401, C402, C405: does not work with py 2.6 # D102: Missing docstring in public method # D103: Missing docstring in public function # E402: module level import not at top of file; see T87409 # H201: Except: format # P102,P103: string does contain unindexed parameters; see I36355923 -ignore = E402,D105,D211,FI10,FI12,FI13,FI15,FI16,FI17,FI5,H101,H201,H236,H301,H404,H405,I100,I101 +ignore = C401,C402,C405,E402,D105,D211,FI10,FI12,FI13,FI15,FI16,FI17,FI5,H101,H201,H236,H301,H404,H405,I100,I101 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* min-version = 2.6 max_line_length = 100 -- To view, visit https://gerrit.wikimedia.org/r/302103 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77feb4036cb670d19e1bbbd6ea461fa858566901 Gerrit-PatchSet: 11 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

← Newer
1
...
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2016