Pywikibot-commits January 2015

pywikibot-commits@lists.wikimedia.org

3 participants
206 discussions

[Gerrit] Pagegenerators: ns handling for titleregex option - change (pywikibot/core)
by jenkins-bot (Code Review) 28 Jan '15

28 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: Pagegenerators: ns handling for titleregex option ...................................................................... Pagegenerators: ns handling for titleregex option Workaround for Bug T85389, a previoulsy done for -newpages. If namespace is given before -titleregex, it can be handled. With argparse support, it will be possible to completely solve the bug. Bug: T57226 Change-Id: I69bf8b9782b97426c0b67ef97b3892f152fe0fb1 --- M pywikibot/pagegenerators.py M tests/pagegenerators_tests.py 2 files changed, 37 insertions(+), 9 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 601f809..0053ce6 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -116,6 +116,8 @@ before -newpages. If used with -recentchanges, efficiency is improved if -namepace/ns is provided before -recentchanges. + If used with -titleregex, -namepace/ns must be provided + before -titleregex and shall contain only one value. -interwiki Work on the given page and all equivalent pages in other languages. This can, for example, be used to fight @@ -698,7 +700,15 @@ regex = pywikibot.input(u'What page names are you looking for?') else: regex = arg[12:] - gen = RegexFilterPageGenerator(self.site.allpages(), regex) + # partial workaround for bug T85389 + # to use -namespace/ns with -newpages, -ns must be given + # before -titleregex, otherwise default namespace is 0. + # allpages only accepts a single namespace, and will raise a + # TypeError if self.namespaces contains more than one namespace. + namespaces = self.namespaces or 0 + gen = RegexFilterPageGenerator( + self.site.allpages(namespace=namespaces), + regex) elif arg.startswith('-grep'): if len(arg) == 5: self.articlefilter_list.append(pywikibot.input( diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index b6fc34d..25e0875 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -548,21 +548,39 @@ self.assertIsInstance(page, pywikibot.Page) self.assertRegex(page.title().lower(), '(.)\\1+') - def test_regexfilter_ns(self): - raise unittest.SkipTest('This test takes over 10 minutes due to T85389') + def test_regexfilter_ns_after(self): + """Bug: T85389: -ns after -titleregex is ignored with a warning.""" gf = pagegenerators.GeneratorFactory() self.assertTrue(gf.handleArg('-titleregex:.*')) - gf.handleArg('-limit:10') gf.handleArg('-ns:1') + gf.handleArg('-limit:10') gen = gf.getCombinedGenerator() - # The code below takes due to bug T85389 pages = list(gen) - # TODO: Fix RegexFilterPageGenerator to handle namespaces other than 0 - # Bug: T85389 - # Below should fail self.assertGreater(len(pages), 0) self.assertLessEqual(len(pages), 10) - self.assertPagesInNamespaces(gen, 1) + self.assertPagesInNamespaces(pages, 0) + + def test_regexfilter_ns_first(self): + gf = pagegenerators.GeneratorFactory() + # Workaround for Bug: T85389 + # Give -ns before -titleregex (as for -newpages) + gf.handleArg('-ns:1') + self.assertTrue(gf.handleArg('-titleregex:.*')) + gf.handleArg('-limit:10') + gen = gf.getCombinedGenerator() + pages = list(gen) + self.assertGreater(len(pages), 0) + self.assertLessEqual(len(pages), 10) + self.assertPagesInNamespaces(pages, 1) + + def test_regexfilter_two_ns_first(self): + gf = pagegenerators.GeneratorFactory() + gf.handleArg('-ns:3,1') + self.assertRaisesRegex( + TypeError, + 'allpages module does not support multiple namespaces', + gf.handleArg, + '-titleregex:.*') def test_prefixing_default(self): gf = pagegenerators.GeneratorFactory() -- To view, visit https://gerrit.wikimedia.org/r/181993 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I69bf8b9782b97426c0b67ef97b3892f152fe0fb1 Gerrit-PatchSet: 8 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] flow: Add Page.is_flow_page() which checks contentmodel - change (pywikibot/core)
by jenkins-bot (Code Review) 28 Jan '15

28 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: flow: Add Page.is_flow_page() which checks contentmodel ...................................................................... flow: Add Page.is_flow_page() which checks contentmodel Don't use flowinfo, we can get the same information by checking the content model. Change-Id: I8f49a609c03d30d3fd5d7ed98b353c9eaae28405 --- M pywikibot/page.py M pywikibot/site.py M tests/page_tests.py 3 files changed, 33 insertions(+), 7 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index a10291f..1204fdc 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1782,16 +1782,17 @@ u'required.' % self.title(asLink=True)) return False + @deprecated('Page.is_flow_page()') def isFlowPage(self): - """Whether the given title is a Flow page. + return self.isFlowPage() - @return: bool + def is_flow_page(self): """ - if not self.site.has_extension('Flow'): - return False - if not hasattr(self, '_flowinfo'): - self.site.loadflowinfo(self) - return 'enabled' in self._flowinfo + Whether a page is a Flow page. + + @rtype: bool + """ + return self.content_model == 'flow-board' # ####### DEPRECATED METHODS ######## diff --git a/pywikibot/site.py b/pywikibot/site.py index 3c3149c..c388187 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2399,6 +2399,7 @@ return (pageitem['imageinfo'] if history else pageitem['imageinfo'][0]) + @deprecated('Check the content model instead') def loadflowinfo(self, page): """ Load Flow-related information about a given page. diff --git a/tests/page_tests.py b/tests/page_tests.py index 63e5e32..2aa20b7 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -550,6 +550,30 @@ self.assertRaises(pywikibot.exceptions.NoPage, p3.get) +class TestFlow(TestCase): + + """Test Flow pages using Page layer.""" + + family = 'mediawiki' + code = 'mediawiki' + + cached = True + + def test_methods(self): + """Test basic Page methods on a Flow page.""" + site = self.get_site() + page = pywikibot.Page(site, u'Talk:Sandbox') + self.assertEqual(page.exists(), True) + page.get() + self.assertEqual(page.isRedirectPage(), False) + + def test_content_model(self): + """Test Flow page content model.""" + site = self.get_site() + page = pywikibot.Page(site, u'Talk:Sandbox') + self.assertEqual(page.content_model, 'flow-board') + + class TestPageUserAction(DefaultSiteTestCase): """Test page user actions.""" -- To view, visit https://gerrit.wikimedia.org/r/187063 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f49a609c03d30d3fd5d7ed98b353c9eaae28405 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [FIX] reflinks: Use BytesIO for binary data - change (pywikibot/core)
by jenkins-bot (Code Review) 27 Jan '15

27 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] reflinks: Use BytesIO for binary data ...................................................................... [FIX] reflinks: Use BytesIO for binary data As compressed data is binary, a BytesIO object needs to be used to handle the data. It was in I79703aa4d3a3d1df5cea546cb18152305c3b0cd4 replaced with io.StringIO which only works on strings (or unicode in Python 2). Before dd558f287f6e786a41a881b0956e43130260a385 it was using StringIO.StringIO which works on bytes and strings but with that change io.StringIO was using in Python 3. Bug: T86462 Change-Id: Ib3ff54242b25578a7387b97e4c6a10b6d21268ea --- M scripts/reflinks.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/reflinks.py b/scripts/reflinks.py index d241476..415d94d 100644 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -601,8 +601,8 @@ # XXX: small issue here: the whole page is downloaded # through f.read(). It might fetch big files/pages. # However, truncating an encoded gzipped stream is not - # an option, for unzipping will fail. - compressed = io.StringIO(f.read()) + # an option, or unzipping will fail. + compressed = io.BytesIO(f.read()) f = gzip.GzipFile(fileobj=compressed) # Read the first 1,000,000 bytes (0.95 MB) -- To view, visit https://gerrit.wikimedia.org/r/186950 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib3ff54242b25578a7387b97e4c6a10b6d21268ea Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [FEAT] Scripts: Use more intelligent generators - change (pywikibot/core)
by jenkins-bot (Code Review) 26 Jan '15

26 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: [FEAT] Scripts: Use more intelligent generators ...................................................................... [FEAT] Scripts: Use more intelligent generators Instead of using the pagegenerators as often as possible, this is only using them, when they provide additional funtionality. Otherwise it's using the normal methods of a page. This removes all usages of the NamespaceFilterPageGenerator in the scripts which does only filter out invalid pages but still requests them. Change-Id: Iddc36b040ff010467559ea8fd7523056a511cb6f --- M pywikibot/pagegenerators.py M scripts/add_text.py M scripts/checkimages.py M scripts/commonscat.py M scripts/disambredir.py M scripts/fixing_redirects.py M scripts/nowcommons.py M scripts/solve_disambiguation.py M scripts/spamremove.py M scripts/templatecount.py M scripts/unlink.py M scripts/weblinkchecker.py 12 files changed, 33 insertions(+), 80 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 792e092..601f809 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1010,7 +1010,8 @@ def CategorizedPageGenerator(category, recurse=False, start=None, - step=None, total=None, content=False): + step=None, total=None, content=False, + namespaces=None): """Yield all pages in a specific category. If recurse is True, pages in subcategories are included as well; if @@ -1026,7 +1027,7 @@ """ kwargs = dict(recurse=recurse, step=step, total=total, - content=content) + content=content, namespaces=namespaces) if start: kwargs['sortby'] = 'sortkey' kwargs['startsort'] = start @@ -1473,7 +1474,7 @@ ImageGenerator = FileGenerator -def PageWithTalkPageGenerator(generator): +def PageWithTalkPageGenerator(generator, return_talk_only=False): """Yield pages and associated talk pages from another generator. Only yields talk pages if the original generator yields a non-talk page, @@ -1481,7 +1482,8 @@ """ for page in generator: - yield page + if not return_talk_only or page.isTalkPage(): + yield page if not page.isTalkPage(): yield page.toggleTalkPage() diff --git a/scripts/add_text.py b/scripts/add_text.py index 3bfc2b9..ae21071 100644 --- a/scripts/add_text.py +++ b/scripts/add_text.py @@ -288,7 +288,6 @@ textfile = None talkPage = False reorderEnabled = True - namespaces = [] # Put the text above or below the text? up = False @@ -346,14 +345,7 @@ pywikibot.error("The text to add wasn't given.") return if talkPage: - generator = pagegenerators.PageWithTalkPageGenerator(generator) - site = pywikibot.Site() - for namespace in site.namespaces(): - index = site.getNamespaceIndex(namespace) - if index % 2 == 1 and index > 0: - namespaces += [index] - generator = pagegenerators.NamespaceFilterPageGenerator( - generator, namespaces, site) + generator = pagegenerators.PageWithTalkPageGenerator(generator, True) for page in generator: (text, newtext, always) = add_text(page, addText, summary, regexSkip, regexSkipUrl, always, up, True, diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 315c606..19f07e6 100644 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -1770,7 +1770,7 @@ firstPageTitle = arg[7:] firstPageTitle = firstPageTitle.split(":")[1:] generator = pywikibot.Site().allpages(start=firstPageTitle, - namespace=6) + namespace=6) repeat = False elif arg.startswith('-page'): if len(arg) == 5: @@ -1804,7 +1804,7 @@ catName = str(arg[5:]) catSelected = pywikibot.Category(pywikibot.Site(), 'Category:%s' % catName) - generator = pg.CategorizedPageGenerator(catSelected) + generator = catSelected.articles(namespaces=[6]) repeat = False elif arg.startswith('-ref'): if len(arg) == 4: @@ -1812,8 +1812,8 @@ u'The references of what page should I parse?')) elif len(arg) > 4: refName = str(arg[5:]) - generator = pg.ReferringPageGenerator( - pywikibot.Page(pywikibot.Site(), refName)) + ref = pywikibot.Page(pywikibot.Site(), refName) + generator = ref.getReferences(namespaces=[6]) repeat = False if not generator: @@ -1862,7 +1862,6 @@ Bot.takesettings() if waitTime: generator = Bot.wait(waitTime, generator, normal, limit) - generator = pg.NamespaceFilterPageGenerator(generator, 6, site) for image in generator: # Setting the image for the main class Bot.setParameters(image.title(withNamespace=False)) diff --git a/scripts/commonscat.py b/scripts/commonscat.py index cc9fb19..6df29f7 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -500,10 +500,7 @@ @type args: list of unicode """ options = {} - generator = None checkcurrent = False - ns = [] - ns.append(14) # Process global args and prepare generator args parser local_args = pywikibot.handle_args(args) @@ -527,14 +524,10 @@ primaryCommonscat, commonscatAlternatives = \ CommonscatBot.getCommonscatTemplate( site.code) - generator = pagegenerators.NamespaceFilterPageGenerator( - pagegenerators.ReferringPageGenerator( - pywikibot.Page(site, u'Template:' + primaryCommonscat), - onlyTemplateInclusion=True), - ns, - site) - - if not generator: + template_page = pywikibot.Page(site, u'Template:' + primaryCommonscat) + generator = template_page.getReferences(namespaces=14, + onlyTemplateInclusion=True) + else: generator = genFactory.getCombinedGenerator() if generator: diff --git a/scripts/disambredir.py b/scripts/disambredir.py index 4f3cdcf..8739f3a 100644 --- a/scripts/disambredir.py +++ b/scripts/disambredir.py @@ -156,7 +156,6 @@ """ local_args = pywikibot.handle_args(args) - generator = None start = local_args[0] if local_args else '!' mysite = pywikibot.Site() @@ -164,17 +163,13 @@ mysite.disambcategory() except pywikibot.Error as e: pywikibot.output(e) - else: - generator = pagegenerators.CategorizedPageGenerator( - mysite.disambcategory(), start=start) - - if not generator: pywikibot.showHelp() return + generator = pagegenerators.CategorizedPageGenerator( + mysite.disambcategory(), start=start, content=True, namespaces=[0]) + # only work on articles - generator = pagegenerators.NamespaceFilterPageGenerator(generator, [0]) - generator = pagegenerators.PreloadingGenerator(generator) pagestodo = [] pagestoload = [] for page in generator: diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py index 10de73d..180163e 100644 --- a/scripts/fixing_redirects.py +++ b/scripts/fixing_redirects.py @@ -217,8 +217,7 @@ if featured: featuredList = i18n.translate(mysite, featured_articles) ref = pywikibot.Page(pywikibot.Site(), featuredList) - gen = pagegenerators.ReferringPageGenerator(ref) - gen = pagegenerators.NamespaceFilterPageGenerator(gen, [0]) + gen = ref.getReferences(namespaces=[0]) if not gen: gen = genFactory.getCombinedGenerator() if gen: diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py index ebdf184..3125fdb 100644 --- a/scripts/nowcommons.py +++ b/scripts/nowcommons.py @@ -271,11 +271,10 @@ nowCommonsTemplates = [pywikibot.Page(self.site, title, ns=10) for title in self.ncTemplates()] - gens = [pg.ReferringPageGenerator(t, followRedirects=True, - onlyTemplateInclusion=True) + gens = [t.getReferences(followRedirects=True, namespaces=[6], + onlyTemplateInclusion=True) for t in nowCommonsTemplates] gen = pg.CombinedPageGenerator(gens) - gen = pg.NamespaceFilterPageGenerator(gen, [6]) gen = pg.DuplicateFilterPageGenerator(gen) gen = pg.PreloadingGenerator(gen) return gen diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 83d1050..e5c07e2 100644 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -1090,15 +1090,9 @@ minimum = int(arg[5:]) elif arg.startswith('-start'): try: - if len(arg) <= len('-start:'): - generator = pagegenerators.CategorizedPageGenerator( - pywikibot.Site().disambcategory()) - else: - generator = pagegenerators.CategorizedPageGenerator( - pywikibot.Site().disambcategory(), - start=arg[7:]) - generator = pagegenerators.NamespaceFilterPageGenerator( - generator, [0]) + generator = pagegenerators.CategorizedPageGenerator( + pywikibot.Site().disambcategory(), + start=arg[7:], namespaces=[0]) except pywikibot.NoPage: pywikibot.output("Disambiguation category for your wiki is not known.") raise diff --git a/scripts/spamremove.py b/scripts/spamremove.py index 92f70a2..0f8303e 100755 --- a/scripts/spamremove.py +++ b/scripts/spamremove.py @@ -34,7 +34,7 @@ # import pywikibot -from pywikibot import pagegenerators, i18n +from pywikibot import i18n from pywikibot.editor import TextEditor @@ -67,10 +67,7 @@ return mysite = pywikibot.Site() - pages = mysite.exturlusage(spamSite) - if namespaces: - pages = pagegenerators.NamespaceFilterPageGenerator(pages, namespaces) - pages = pagegenerators.PreloadingGenerator(pages) + pages = mysite.exturlusage(spamSite, namespaces=namespaces, content=True) summary = i18n.twtranslate(mysite, 'spamremove-remove', {'url': spamSite}) diff --git a/scripts/templatecount.py b/scripts/templatecount.py index 036b012..8e36b94 100644 --- a/scripts/templatecount.py +++ b/scripts/templatecount.py @@ -40,7 +40,6 @@ import datetime import pywikibot -from pywikibot import pagegenerators templates = ['ref', 'note', 'ref label', 'note label', 'reflist'] @@ -100,12 +99,8 @@ mytpl = mysite.ns_index(mysite.template_namespace()) for template in templates: transcludingArray = [] - gen = pagegenerators.ReferringPageGenerator( - pywikibot.Page(mysite, template, ns=mytpl), - onlyTemplateInclusion=True) - if namespaces: - gen = pagegenerators.NamespaceFilterPageGenerator(gen, - namespaces) + gen = pywikibot.Page(mysite, template, ns=mytpl).getReferences( + namespaces=namespaces, onlyTemplateInclusion=True) for page in gen: transcludingArray.append(page) yield template, transcludingArray diff --git a/scripts/unlink.py b/scripts/unlink.py index ea24f7c..de05fdd 100755 --- a/scripts/unlink.py +++ b/scripts/unlink.py @@ -31,7 +31,7 @@ import re import pywikibot from pywikibot.editor import TextEditor -from pywikibot import pagegenerators, i18n, Bot +from pywikibot import i18n, Bot class UnlinkBot(Bot): @@ -49,10 +49,8 @@ self.pageToUnlink = pageToUnlink linktrail = self.pageToUnlink.site.linktrail() - gen = pagegenerators.ReferringPageGenerator(pageToUnlink) - if self.getOption('namespaces') != []: - gen = pagegenerators.NamespaceFilterPageGenerator(gen, self.getOption('namespaces')) - self.generator = pagegenerators.PreloadingGenerator(gen) + self.generator = pageToUnlink.getReferences( + namespaces=self.getOption('namespaces'), content=True) # The regular expression which finds links. Results consist of four # groups: # diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index a94bb79..ba33030 100644 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -214,7 +214,7 @@ continue self.skipping = False page = pywikibot.Page(self.site, entry.title) - if not self.namespaces == []: + if self.namespaces: if page.namespace() not in self.namespaces: continue found = False @@ -852,9 +852,6 @@ """ gen = None xmlFilename = None - # Which namespaces should be processed? - # default to [] which means all namespaces will be processed - namespaces = [] HTTPignore = [] day = 7 @@ -867,11 +864,6 @@ config.report_dead_links_on_talk = True elif arg == '-notalk': config.report_dead_links_on_talk = False - elif arg.startswith('-namespace:'): - try: - namespaces.append(int(arg[11:])) - except ValueError: - namespaces.append(arg[11:]) elif arg == '-repeat': gen = RepeatPageGenerator() elif arg.startswith('-ignore:'): @@ -897,13 +889,11 @@ xmlStart except NameError: xmlStart = None - gen = XmlDumpPageGenerator(xmlFilename, xmlStart, namespaces) + gen = XmlDumpPageGenerator(xmlFilename, xmlStart, genFactory.namespaces) if not gen: gen = genFactory.getCombinedGenerator() if gen: - if namespaces != []: - gen = pagegenerators.NamespaceFilterPageGenerator(gen, namespaces) # fetch at least 240 pages simultaneously from the wiki, but more if # a high thread number is set. pageNumber = max(240, config.max_external_links * 2) -- To view, visit https://gerrit.wikimedia.org/r/185982 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iddc36b040ff010467559ea8fd7523056a511cb6f Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [IMPROV] Reduce maximum line length to 130 - change (pywikibot/core)
by jenkins-bot (Code Review) 26 Jan '15

26 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] Reduce maximum line length to 130 ...................................................................... [IMPROV] Reduce maximum line length to 130 Change-Id: Iaf41e959fd03040b6428f061f2ea4a1586cf3c32 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikiquote_family.py M pywikibot/fixes.py M pywikibot/site.py M scripts/commonscat.py M scripts/coordinate_import.py M scripts/fixing_redirects.py M scripts/harvest_template.py M scripts/imagerecat.py M scripts/login.py M scripts/solve_disambiguation.py M tests/deprecation_tests.py M tests/ipregex_tests.py M tests/textlib_tests.py M tox.ini 15 files changed, 95 insertions(+), 50 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index eccb20f..baf844c 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -72,7 +72,7 @@ 'jp': 'ja', 'kn': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 'ks': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_K… - 'lb': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_L… + 'lb': None, # noqa https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_L… 'ln': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_L… 'lv': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_L… 'mi': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_M… @@ -82,12 +82,12 @@ 'na': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_N… 'nah': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_N… 'nb': 'no', - 'nds': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_P… + 'nds': None, # noqa https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_P… 'ps': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_P… 'qu': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Q… 'rm': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_R… 'se': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_S… - 'simple': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_S… + 'simple': None, # noqa https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_S… 'su': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_B… 'sw': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=25170 'tk': None, diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 3c91152..52dfffb 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -76,7 +76,7 @@ 'nb': 'no', 'nds': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_L… 'qu': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Q… - 'simple': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_S… + 'simple': None, # noqa https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_S… 'tk': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_T… 'tokipona': None, 'tt': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_T… diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py index a045db3..3261004 100644 --- a/pywikibot/fixes.py +++ b/pywikibot/fixes.py @@ -109,7 +109,7 @@ 'de': u'Bot: korrigiere Grammatik', }, 'replacements': [ - # (u'([Ss]owohl) ([^,\.]+?), als auch', r'\1 \2 als auch'), + # (u'([Ss]owohl) ([^,\.]+?), als auch', r'\1 \2 als auch'), # (u'([Ww]eder) ([^,\.]+?), noch', r'\1 \2 noch'), # # Vorsicht bei Substantiven, z. B. 3-Jähriger! @@ -170,7 +170,9 @@ r'/\w(,\w)*/', # Laut-Aufzählung in der Linguistik r'[xyz](,[xyz])+', # Variablen in der Mathematik (unklar, ob Leerzeichen hier Pflicht sind) r'(?m)^;(.*?)$', # Definitionslisten, dort gibt es oft absichtlich Leerzeichen vor Doppelpunkten - r'\d+h( | )\d+m', # Schreibweise für Zeiten, vor allem in Film-Infoboxen. Nicht korrekt, aber dafür schön kurz. + r'\d+h( | )\d+m', + # Schreibweise für Zeiten, vor allem in Film-Infoboxen. + # Nicht korrekt, aber dafür schön kurz. r'(?i)\[\[(Bild|Image|Media):.+?\|', # Dateinamen auslassen r'{{bgc\|.*?}}', # Hintergrundfarbe r'\d+m', # bei chemischen Formeln @@ -301,7 +303,8 @@ # dash in external link, where the correct end of the URL can # be detected from the file extension. It is very unlikely that # this will cause mistakes. - (r'\[(?P<url>https?://[^\|\] ]+?(\.pdf|\.html|\.htm|\.php|\.asp|\.aspx|\.jsp)) *\| *(?P<label>[^\|\]]+?)\]', r'[\g<url> \g<label>]'), + (r'\[(?P<url>https?://[^\|\] ]+?(\.pdf|\.html|\.htm|\.php|\.asp|\.aspx|\.jsp)) *\|' + r' *(?P<label>[^\|\]]+?)\]', r'[\g<url> \g<label>]'), ], 'exceptions': { 'inside-tags': [ @@ -401,13 +404,17 @@ # space after death sign w/ linked date # (u'†\[\[(\d)', u'† [[\\1'), # (u'&dagger;\[\[(\d)', u'† [[\\1'), - (u'\[\[(\d+\. (?:Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember)) (\d{1,4})\]\]', u'[[\\1]] [[\\2]]'), + (u'\[\[(\d+\. (?:Januar|Februar|März|April|Mai|Juni|Juli|August|' + u'September|Oktober|November|Dezember)) (\d{1,4})\]\]', u'[[\\1]] [[\\2]]'), # Keine führende Null beim Datum (ersteinmal nur bei denen, bei denen auch ein Leerzeichen fehlt) - (u'0(\d+)\.(Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember)', r'\1. \2'), + (u'0(\d+)\.(Januar|Februar|März|April|Mai|Juni|Juli|August|' + u'September|Oktober|November|Dezember)', r'\1. \2'), # Kein Leerzeichen zwischen Tag und Monat - (u'(\d+)\.(Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember)', r'\1. \2'), + (u'(\d+)\.(Januar|Februar|März|April|Mai|Juni|Juli|August|' + u'September|Oktober|November|Dezember)', r'\1. \2'), # Kein Punkt vorm Jahr - (u'(\d+)\. (Januar|Februar|März|April|Mai|Juni|Juli|August|September|Oktober|November|Dezember)\.(\d{1,4})', r'\1. \2 \3'), + (u'(\d+)\. (Januar|Februar|März|April|Mai|Juni|Juli|August|' + u'September|Oktober|November|Dezember)\.(\d{1,4})', r'\1. \2 \3'), ], 'exceptions': { 'inside': [ diff --git a/pywikibot/site.py b/pywikibot/site.py index 873cc6b..913bfc2 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -3956,12 +3956,16 @@ "noapiwrite": "API editing not enabled on %(site)s wiki", "writeapidenied": "User %(user)s is not authorized to edit on %(site)s wiki", "cantcreate": "User %(user)s not authorized to create new pages on %(site)s wiki", - "cantcreate-anon": """Bot is not logged in, and anon users are not authorized to create new pages on %(site)s wiki""", - "noimageredirect-anon": """Bot is not logged in, and anon users are not authorized to create image redirects on %(site)s wiki""", + "cantcreate-anon": + "Bot is not logged in, and anon users are not authorized to create " + "new pages on %(site)s wiki", + "noimageredirect-anon": + "Bot is not logged in, and anon users are not authorized to create " + "image redirects on %(site)s wiki", "noimageredirect": "User %(user)s not authorized to create image redirects on %(site)s wiki", "filtered": "%(info)s", "contenttoobig": "%(info)s", - "noedit-anon": """Bot is not logged in, and anon users are not authorized to edit on %(site)s wiki""", + "noedit-anon": "Bot is not logged in, and anon users are not authorized to edit on %(site)s wiki", "noedit": "User %(user)s not authorized to edit pages on %(site)s wiki", "missingtitle": NoCreateError, diff --git a/scripts/commonscat.py b/scripts/commonscat.py index cc9fb19..adabbe4 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -456,7 +456,9 @@ loguser = logitem.user() logcomment = logitem.comment() # Some logic to extract the target page. - regex = u'moved to \[\[\:?Category:(?P<newcat1>[^\|\}]+)(\|[^\}]+)?\]\]|Robot: Changing Category:(.+) to Category:(?P<newcat2>.+)' + regex = ( + r'moved to \[\[\:?Category:(?P<newcat1>[^\|\}]+)(\|[^\}]+)?\]\]|' + r'Robot: Changing Category:(.+) to Category:(?P<newcat2>.+)') m = re.search(regex, logcomment, flags=re.I) if m: if m.group('newcat1'): diff --git a/scripts/coordinate_import.py b/scripts/coordinate_import.py index f4f680e..6074ba3 100644 --- a/scripts/coordinate_import.py +++ b/scripts/coordinate_import.py @@ -7,10 +7,12 @@ python coordinate_import.py -lang:en -family:wikipedia -cat:Category:Coordinates_not_on_Wikidata -This will work on all pages in the category "coordinates not on Wikidata" and will import the coordinates on these pages to Wikidata. +This will work on all pages in the category "coordinates not on Wikidata" and +will import the coordinates on these pages to Wikidata. -The data from the "GeoData" extension (https://www.mediawiki.org/wiki/Extension:GeoData) is used so that extension has to be setup properly. -You can look at the [[Special:Nearby]] page on your local Wiki to see if it's populated. +The data from the "GeoData" extension (https://www.mediawiki.org/wiki/Extension:GeoData) +is used so that extension has to be setup properly. You can look at the +[[Special:Nearby]] page on your local Wiki to see if it's populated. You can use any typical pagegenerator to provide with a list of pages: diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py index 10de73d..c8a8a51 100644 --- a/scripts/fixing_redirects.py +++ b/scripts/fixing_redirects.py @@ -66,7 +66,8 @@ linktrail = mysite.linktrail() # make a backup of the original text so we can show the changes later - linkR = re.compile(r'\[\[(?P<title>[^\]\|#]*)(?P<section>#[^\]\|]*)?(\|(?P<label>[^\]]*))?\]\](?P<linktrail>' + linktrail + ')') + linkR = re.compile(r'\[\[(?P<title>[^\]\|#]*)(?P<section>#[^\]\|]*)?' + r'(\|(?P<label>[^\]]*))?\]\](?P<linktrail>' + linktrail + ')') curpos = 0 # This loop will run until we have finished the current page while True: diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index 102931d..d5e0d64 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -5,11 +5,8 @@ Usage: -python harvest_template.py -transcludes:"..." template_parameter PID [template_parameter PID] - - or - -python harvest_template.py [generators] -template:"..." template_parameter PID [template_parameter PID] +* harvest_template.py -transcludes:"..." template_parameter PID [template_parameter PID] +* harvest_template.py [generators] -template:"..." template_parameter PID [template_parameter PID] This will work on all pages that transclude the template in the article namespace @@ -20,7 +17,7 @@ Examples: -python harvest_template.py -lang:nl -cat:Sisoridae -template:"Taxobox straalvinnige" -namespace:0 orde P70 familie P71 geslacht P74 +* harvest_template.py -lang:nl -cat:Sisoridae -template:"Taxobox straalvinnige" -namespace:0 orde P70 familie P71 geslacht P74 """ # @@ -147,7 +144,9 @@ # Try to extract a valid page match = re.search(pywikibot.link_regex, value) if not match: - pywikibot.output(u'%s field %s value %s isnt a wikilink. Skipping' % (claim.getID(), field, value)) + pywikibot.output( + u'%s field %s value %s isnt a wikilink. Skipping' + % (claim.getID(), field, value)) continue link_text = match.group(1) diff --git a/scripts/imagerecat.py b/scripts/imagerecat.py index 70e7ccd..7bf8f1d 100644 --- a/scripts/imagerecat.py +++ b/scripts/imagerecat.py @@ -146,7 +146,12 @@ # Cant handle other sites atm return [], [], [] - commonsenseRe = re.compile('^#COMMONSENSE(.*)#USAGE(\s)+$(?P<usagenum>(\d)+)$\s(?P<usage>(.*))\s#KEYWORDS(\s)+$(?P<keywords>(\d)+)$(.*)#CATEGORIES(\s)+$(?P<catnum>(\d)+)$\s(?P<cats>(.*))\s#GALLERIES(\s)+$(?P<galnum>(\d)+)$\s(?P<gals>(.*))\s(.*)#EOF$', re.MULTILINE + re.DOTALL) # noqa + commonsenseRe = re.compile( + '^#COMMONSENSE(.*)#USAGE(\s)+$(?P<usagenum>(\d)+)$\s(?P<usage>(.*))\s' + '#KEYWORDS(\s)+$(?P<keywords>(\d)+)$(.*)' + '#CATEGORIES(\s)+$(?P<catnum>(\d)+)$\s(?P<cats>(.*))\s' + '#GALLERIES(\s)+$(?P<galnum>(\d)+)$\s(?P<gals>(.*))\s(.*)#EOF$', + re.MULTILINE + re.DOTALL) gotInfo = False matches = None diff --git a/scripts/login.py b/scripts/login.py index 71cdbb2..8d52556 100755 --- a/scripts/login.py +++ b/scripts/login.py @@ -86,7 +86,8 @@ elif arg == "-all": logall = True elif arg == "-force": - pywikibot.output(u"To force a re-login, please delete the revelant lines from '%s' (or the entire file) and try again." % + pywikibot.output(u"To force a re-login, please delete the revelant " + u"lines from '%s' (or the entire file) and try again." % join(config.base_dir, 'pywikibot.lwp')) elif arg == "-logout": logout = True diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 83d1050..660a7ba 100644 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -972,14 +972,22 @@ {'from': disambPage.title()} ) else: - self.comment = i18n.twtranslate(self.mysite, 'solve_disambiguation-redirect-resolved', {'from': disambPage.title(), 'to': targets}) + self.comment = i18n.twtranslate( + self.mysite, 'solve_disambiguation-redirect-resolved', + {'from': disambPage.title(), 'to': targets}) else: if unlink and not new_targets: - self.comment = i18n.twtranslate(self.mysite, 'solve_disambiguation-links-removed', {'from': disambPage.title()}) + self.comment = i18n.twtranslate( + self.mysite, 'solve_disambiguation-links-removed', + {'from': disambPage.title()}) elif dn and not new_targets: - self.comment = i18n.twtranslate(self.mysite, 'solve_disambiguation-adding-dn-template', {'from': disambPage.title()}) + self.comment = i18n.twtranslate( + self.mysite, 'solve_disambiguation-adding-dn-template', + {'from': disambPage.title()}) else: - self.comment = i18n.twtranslate(self.mysite, 'solve_disambiguation-links-resolved', {'from': disambPage.title(), 'to': targets}) + self.comment = i18n.twtranslate( + self.mysite, 'solve_disambiguation-links-resolved', + {'from': disambPage.title(), 'to': targets}) def run(self): if self.main_only: diff --git a/tests/deprecation_tests.py b/tests/deprecation_tests.py index 2b13e38..b9a662e 100644 --- a/tests/deprecation_tests.py +++ b/tests/deprecation_tests.py @@ -628,27 +628,33 @@ rv = f.deprecated_instance_method_args(bah='b', bah2='c') self.assertEqual(rv, ('b', 'c')) self.assertDeprecation( - 'bah argument of ' + __name__ + '.DeprecatedMethodClass.deprecated_instance_method_args is deprecated; use foo instead.') + 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_args is deprecated; use foo instead.') self.assertDeprecation( - 'bah2 argument of ' + __name__ + '.DeprecatedMethodClass.deprecated_instance_method_args is deprecated; use foo2 instead.') + 'bah2 argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_args is deprecated; use foo2 instead.') DeprecatorTestCase._reset_messages() rv = f.deprecated_instance_method_args(foo='b', bah2='c') self.assertEqual(rv, ('b', 'c')) self.assertNoDeprecation( - 'bah argument of ' + __name__ + '.DeprecatedMethodClass.deprecated_instance_method_args is deprecated; use foo instead.') + 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_args is deprecated; use foo instead.') self.assertDeprecation( - 'bah2 argument of ' + __name__ + '.DeprecatedMethodClass.deprecated_instance_method_args is deprecated; use foo2 instead.') + 'bah2 argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_args is deprecated; use foo2 instead.') DeprecatorTestCase._reset_messages() rv = f.deprecated_instance_method_args(foo2='c', bah='b') self.assertEqual(rv, ('b', 'c')) self.assertDeprecation( - 'bah argument of ' + __name__ + '.DeprecatedMethodClass.deprecated_instance_method_args is deprecated; use foo instead.') + 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_args is deprecated; use foo instead.') self.assertNoDeprecation( - 'bah2 argument of ' + __name__ + '.DeprecatedMethodClass.deprecated_instance_method_args is deprecated; use foo2 instead.') + 'bah2 argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_args is deprecated; use foo2 instead.') DeprecatorTestCase._reset_messages() @@ -666,7 +672,8 @@ self.assertDeprecation( __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg is deprecated.') self.assertNoDeprecation( - 'bah argument of ' + __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg is deprecated; use foo instead.') + 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_and_arg is deprecated; use foo instead.') DeprecatorTestCase._reset_messages() @@ -676,7 +683,8 @@ self.assertDeprecation( __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg is deprecated.') self.assertDeprecation( - 'bah argument of ' + __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg is deprecated; use foo instead.') + 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_and_arg is deprecated; use foo instead.') DeprecatorTestCase._reset_messages() @@ -686,7 +694,8 @@ self.assertDeprecation( __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg is deprecated.') self.assertNoDeprecation( - 'bah argument of ' + __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg is deprecated; use foo instead.') + 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_and_arg is deprecated; use foo instead.') def test_deprecated_instance_method_and_arg2(self): """Test @deprecated and @deprecate_arg with instance methods.""" @@ -698,7 +707,8 @@ self.assertDeprecation( __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2 is deprecated.') self.assertNoDeprecation( - 'bah argument of ' + __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2 is deprecated; use foo instead.') + 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_and_arg2 is deprecated; use foo instead.') DeprecatorTestCase._reset_messages() @@ -708,7 +718,8 @@ self.assertDeprecation( __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2 is deprecated.') self.assertDeprecation( - 'bah argument of ' + __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2 is deprecated; use foo instead.') + 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_and_arg2 is deprecated; use foo instead.') DeprecatorTestCase._reset_messages() @@ -718,7 +729,8 @@ self.assertDeprecation( __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2 is deprecated.') self.assertNoDeprecation( - 'bah argument of ' + __name__ + '.DeprecatedMethodClass.deprecated_instance_method_and_arg2 is deprecated; use foo instead.') + 'bah argument of ' + __name__ + '.DeprecatedMethodClass.' + 'deprecated_instance_method_and_arg2 is deprecated; use foo instead.') if __name__ == '__main__': diff --git a/tests/ipregex_tests.py b/tests/ipregex_tests.py index cf61a19..75fe6a2 100644 --- a/tests/ipregex_tests.py +++ b/tests/ipregex_tests.py @@ -197,8 +197,10 @@ self.ipv6test(False, "1.2.3.4::") # Testing IPv4 addresses represented as dotted-quads - # Leading zero's in IPv4 addresses not allowed: some systems treat the leading "0" in ".086" as the start of an octal number - # Update: The BNF in RFC-3986 explicitly defines the dec-octet (for IPv4 addresses) not to have a leading zero + # Leading zero's in IPv4 addresses not allowed: some systems treat the + # leading "0" in ".086" as the start of an octal number + # Update: The BNF in RFC-3986 explicitly defines the dec-octet + # (for IPv4 addresses) not to have a leading zero self.ipv6test(False, "fe80:0000:0000:0000:0204:61ff:254.157.241.086") self.ipv6test(True, "::ffff:192.0.2.128") # but this is OK, since there's a single digit self.ipv6test(False, "XXXX:XXXX:XXXX:XXXX:XXXX:XXXX:1.2.3.4") diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 630ced4..2ade780 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -209,7 +209,8 @@ self.assertEqual(func('{{ a }}'), [('a', OrderedDict())]) self.assertEqual(func('{{a|b=c}}'), [('a', OrderedDict((('b', 'c'), )))]) self.assertEqual(func('{{a|b|c=d}}'), [('a', OrderedDict((('1', 'b'), ('c', 'd'))))]) - self.assertEqual(func('{{a|b=c|f=g|d=e|1=}}'), [('a', OrderedDict((('b', 'c'), ('f', 'g'), ('d', 'e'), ('1', ''))))]) + self.assertEqual(func('{{a|b=c|f=g|d=e|1=}}'), + [('a', OrderedDict((('b', 'c'), ('f', 'g'), ('d', 'e'), ('1', ''))))]) self.assertEqual(func('{{a|1=2|c=d}}'), [('a', OrderedDict((('1', '2'), ('c', 'd'))))]) self.assertEqual(func('{{a|c=d|1=2}}'), [('a', OrderedDict((('c', 'd'), ('1', '2'))))]) self.assertEqual(func('{{a|5=d|a=b}}'), [('a', OrderedDict((('5', 'd'), ('a', 'b'))))]) @@ -217,7 +218,8 @@ self.assertEqual(func('{{a|=|}}'), [('a', OrderedDict((('', ''), ('1', ''))))]) self.assertEqual(func('{{a||}}'), [('a', OrderedDict((('1', ''), ('2', ''))))]) self.assertEqual(func('{{a|b={{{1}}}}}'), [('a', OrderedDict((('b', '{{{1}}}'), )))]) - self.assertEqual(func('{{a|b=<noinclude>{{{1}}}</noinclude>}}'), [('a', OrderedDict((('b', '<noinclude>{{{1}}}</noinclude>'), )))]) + self.assertEqual(func('{{a|b=<noinclude>{{{1}}}</noinclude>}}'), + [('a', OrderedDict((('b', '<noinclude>{{{1}}}</noinclude>'), )))]) self.assertEqual(func('{{subst:a|b=c}}'), [('subst:a', OrderedDict((('b', 'c'), )))]) self.assertEqual(func('{{safesubst:a|b=c}}'), [('safesubst:a', OrderedDict((('b', 'c'), )))]) self.assertEqual(func('{{msgnw:a|b=c}}'), [('msgnw:a', OrderedDict((('b', 'c'), )))]) diff --git a/tox.ini b/tox.ini index 915cf18..b0e14ae 100644 --- a/tox.ini +++ b/tox.ini @@ -136,10 +136,10 @@ [flake8] ignore = E122,E127,E241,E265 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* -max_line_length = 150 +max_line_length = 130 [pep8] ignore = E122,E127,E241 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* -max_line_length = 150 +max_line_length = 130 -- To view, visit https://gerrit.wikimedia.org/r/186780 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf41e959fd03040b6428f061f2ea4a1586cf3c32 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [core] replace deprecated getNamespaceIndex() with ns_index() - change (pywikibot/core)
by jenkins-bot (Code Review) 26 Jan '15

26 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: [core] replace deprecated getNamespaceIndex() with ns_index() ...................................................................... [core] replace deprecated getNamespaceIndex() with ns_index() - getNamespaceIndex() is marked as deprecated method. - some doc cleanups Change-Id: I96dc118224965696531011d3f3a84dc559784584 --- M scripts/templatecount.py 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/templatecount.py b/scripts/templatecount.py index ab70b97..036b012 100644 --- a/scripts/templatecount.py +++ b/scripts/templatecount.py @@ -21,13 +21,13 @@ Examples: -Counts how many times {{ref}} and {{note}} are transcluded in articles. +Counts how many times {{ref}} and {{note}} are transcluded in articles: - python templatecount.py -count -namespace:0 ref note + templatecount.py -count -namespace:0 ref note -Lists all the category pages that transclude {{cfd}} and {{cfdu}}. +Lists all the category pages that transclude {{cfd}} and {{cfdu}}: - python templatecount.py -list -namespace:14 cfd cfdu + templatecount.py -list -namespace:14 cfd cfdu """ # @@ -97,14 +97,15 @@ mysite = pywikibot.Site() # The names of the templates are the keys, and lists of pages # transcluding templates are the values. - mytpl = mysite.getNamespaceIndex(mysite.template_namespace()) + mytpl = mysite.ns_index(mysite.template_namespace()) for template in templates: transcludingArray = [] gen = pagegenerators.ReferringPageGenerator( pywikibot.Page(mysite, template, ns=mytpl), onlyTemplateInclusion=True) if namespaces: - gen = pagegenerators.NamespaceFilterPageGenerator(gen, namespaces) + gen = pagegenerators.NamespaceFilterPageGenerator(gen, + namespaces) for page in gen: transcludingArray.append(page) yield template, transcludingArray -- To view, visit https://gerrit.wikimedia.org/r/186640 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I96dc118224965696531011d3f3a84dc559784584 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Improvement: Handle PageSaveRelatedError while putting sd te... - change (pywikibot/core)
by jenkins-bot (Code Review) 26 Jan '15

26 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: Improvement: Handle PageSaveRelatedError while putting sd template ...................................................................... Improvement: Handle PageSaveRelatedError while putting sd template - When a speedy deletion template is to be written on a page, handle PageSaveRelatedError and print that error. - Print an additional message if the script cannot solve the broken redirect or mark the page for deletion. - Remove the blank line at the end of page processing. Change-Id: I762db6a3e1c4b711dee009893fadab5ee7566ca4 --- M scripts/redirect.py 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/redirect.py b/scripts/redirect.py index 2fa2c83..6402c57 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -502,10 +502,15 @@ targetPage.site, 'redirect-broken-redirect-template' ) + "\n" + content - redir_page.put(content, reason) + try: + redir_page.put(content, reason) + except pywikibot.PageSaveRelatedError as e: + pywikibot.error(e) else: pywikibot.output( u'No speedy deletion template available') + else: + pywikibot.output(u'Cannot fix or delete the broken redirect') except pywikibot.IsRedirectPage: pywikibot.output(u"Redirect target %s is also a redirect! " u"Won't delete anything." @@ -516,7 +521,6 @@ pywikibot.output( u'Redirect target %s does exist! Won\'t delete anything.' % targetPage.title(asLink=True)) - pywikibot.output(u'') def fix_double_redirects(self): for redir_name in self.generator.retrieve_double_redirects(): -- To view, visit https://gerrit.wikimedia.org/r/173778 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I762db6a3e1c4b711dee009893fadab5ee7566ca4 Gerrit-PatchSet: 2 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: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Split too long lines part II - change (pywikibot/core)
by jenkins-bot (Code Review) 26 Jan '15

26 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: Split too long lines part II ...................................................................... Split too long lines part II The maximum is 150 characters now Alongside with some other minor pep8 fixes Change-Id: I28c15577df3857a04d820ccd2f5558d92450f424 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wiktionary_family.py M pywikibot/fixes.py M scripts/checkimages.py M scripts/image.py M scripts/interwiki.py M scripts/script_wui.py M scripts/states_redirect.py M scripts/weblinkchecker.py M tests/i18n/test.py M tests/pagegenerators_tests.py M tox.ini 12 files changed, 49 insertions(+), 32 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 6cbc6ab..eccb20f 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -54,7 +54,7 @@ self.obsolete = { 'aa': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_A… 'ak': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_A… - 'als': None, # https://als.wikipedia.org/wiki/Wikipedia:Stammtisch/Archiv_2008-1#Afterward… + 'als': None, # https://als.wikipedia.org/wiki/Special:PermaLink/603754#Closing_wt.2C_wb.2C… 'as': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_A… 'ast': None, 'ay': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_A… diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index bb2504f..374dc0a 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -97,7 +97,7 @@ 'aa': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_A… 'ab': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_A… 'ak': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_A… - 'als': None, # https://als.wikipedia.org/wiki/Wikipedia:Stammtisch/Archiv_2008-1#Afterward… + 'als': None, # https://als.wikipedia.org/wiki/Special:PermaLink/603754#Closing_wt.2C_wb.2C… 'as': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_A… 'av': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_A… 'ba': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_B… diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py index e2e3e4e..a045db3 100644 --- a/pywikibot/fixes.py +++ b/pywikibot/fixes.py @@ -129,14 +129,14 @@ # Temperaturangabe mit falsch gesetztem Leerzeichen (u'(?<!\w)(\d+|\d+[\.,]\d+)° C(?=\W|²|³|$)', r'\1' + u' °C'), # Kein Leerzeichen nach Komma - (u'([a-zäöüß](\]\])?,)((\[\[)?[a-zäöüA-ZÄÖÜ])', r'\1 \3'), + (u'([a-zäöüß](\]\])?,)((\[\[)?[a-zäöüA-ZÄÖÜ])', r'\1 \3'), # Leerzeichen und Komma vertauscht - (u'([a-zäöüß](\]\])?) ,((\[\[)?[a-zäöüA-ZÄÖÜ])', r'\1, \3'), + (u'([a-zäöüß](\]\])?) ,((\[\[)?[a-zäöüA-ZÄÖÜ])', r'\1, \3'), # Plenks (d. h. Leerzeichen auch vor dem Komma/Punkt/Ausrufezeichen/Fragezeichen) # Achtung bei Französisch: https://de.wikipedia.org/wiki/Plenk#Sonderfall_Franz.C3.B6sisch # Leerzeichen vor Doppelpunkt/Semikolon kann korrekt sein, nach irgendeiner Norm für Zitationen. - (u'([a-zäöüß](\]\])?) ([,\.!\?]) ((\[\[)?[a-zäöüA-ZÄÖÜ])', r'\1\3 \4'), - # (u'([a-z]\.)([A-Z])', r'\1 \2'), + (u'([a-zäöüß](\]\])?) ([,\.!\?]) ((\[\[)?[a-zäöüA-ZÄÖÜ])', r'\1\3 \4'), + # (u'([a-z]\.)([A-Z])', r'\1 \2'), ], 'exceptions': { 'inside-tags': [ @@ -172,9 +172,11 @@ r'(?m)^;(.*?)$', # Definitionslisten, dort gibt es oft absichtlich Leerzeichen vor Doppelpunkten r'\d+h( | )\d+m', # Schreibweise für Zeiten, vor allem in Film-Infoboxen. Nicht korrekt, aber dafür schön kurz. r'(?i)\[\[(Bild|Image|Media):.+?\|', # Dateinamen auslassen - r'{{bgc\|.*?}}', # Hintergrundfarbe + r'{{bgc\|.*?}}', # Hintergrundfarbe r'\d+m', # bei chemischen Formeln - r'$[A-Z][A-Za-z]*(,[A-Z][A-Za-z]*(.*?|.*?|))+$' # chemische Formel, z. B. AuPb(Pb,Sb,Bi)Te. Hier sollen keine Leerzeichen hinter die Kommata. + r'$[A-Z][A-Za-z]*(,[A-Z][A-Za-z]*(.*?|.*?|))+$' + # chemische Formel, z. B. AuPb(Pb,Sb,Bi)Te. + # Hier sollen keine Leerzeichen hinter die Kommata. ], 'title': [ r'Arsen', # chemische Formel diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 11cdf22..315c606 100644 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -302,7 +302,9 @@ 'en': u"{{subst:image source|File:%s}} --~~~~", 'fa': u"{{جا:اخطار نگاره|%s}}", 'ga': u"{{subst:Foinse na híomhá|File:%s}} --~~~~", - 'hu': u"{{subst:adjforrást|Kép:%s}} \n Ezt az üzenetet ~~~ automatikusan helyezte el a vitalapodon, kérdéseddel fordulj a gazdájához, vagy a [[WP:KF|Kocsmafalhoz]]. --~~~~", + 'hu': u"{{subst:adjforrást|Kép:%s}} \n Ezt az üzenetet ~~~ automatikusan " + u"helyezte el a vitalapodon, kérdéseddel fordulj a gazdájához, vagy " + u"a [[WP:KF|Kocsmafalhoz]]. --~~~~", 'it': u"{{subst:Progetto:Coordinamento/Immagini/Bot/Messaggi/Senza licenza|%s|__botnick__}} --~~~~", 'ja': u"\n{{subst:Image copyright|File:%s}}--~~~~", 'ko': u'\n{{subst:User:Kwjbot IV/untagged|%s}} --~~~~', diff --git a/scripts/image.py b/scripts/image.py index 009478d..00758e4 100644 --- a/scripts/image.py +++ b/scripts/image.py @@ -147,7 +147,9 @@ # Be careful, spaces and _ have been converted to '\ ' and '\_' escaped = re.sub('\\\\[_ ]', '[_ ]', escaped) if not self.getOption('loose') or not self.new_image: - image_regex = re.compile(r'\[\[ *(?:' + '|'.join(self.site.namespace(6, all=True)) + ')\s*:\s*' + escaped + ' *(?P<parameters>\|[^\n]+|) *\]\]') + image_regex = re.compile( + r'\[\[ *(?:%s)\s*:\s*%s *(?P<parameters>\|[^\n]+|) *\]\]' + % ('|'.join(self.site.namespace(6, all=True)), escaped)) else: image_regex = re.compile(r'' + escaped) diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 1158110..93cb2f8 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -2587,7 +2587,10 @@ pywikibot.output(u"Dump file is empty?! Starting at the beginning.") nextPage = "!" namespace = 0 - hintlessPageGen = pagegenerators.CombinedPageGenerator([hintlessPageGen, pagegenerators.AllpagesPageGenerator(nextPage, namespace, includeredirects=False)]) + gen2 = pagegenerators.AllpagesPageGenerator( + nextPage, namespace, includeredirects=False) + hintlessPageGen = pagegenerators.CombinedPageGenerator( + [hintlessPageGen, gen2]) site.login() bot = InterwikiBot() diff --git a/scripts/script_wui.py b/scripts/script_wui.py index 12dea61..7250589 100755 --- a/scripts/script_wui.py +++ b/scripts/script_wui.py @@ -262,7 +262,11 @@ pywikibot.config.simulate = __simulate sys.argv = __sys_argv - pywikibot.output(u'environment: garbage; %s / memory; %s / members; %s' % (gc.collect(), resource.getrusage(resource.RUSAGE_SELF).ru_maxrss * resource.getpagesize(), len(dir()))) + pywikibot.output( + u'environment: garbage; %s / memory; %s / members; %s' % ( + gc.collect(), + resource.getrusage(resource.RUSAGE_SELF).ru_maxrss * resource.getpagesize(), + len(dir()))) # 'len(dir())' is equivalent to 'len(inspect.getmembers(__main__))' # append result to output page @@ -283,7 +287,9 @@ # append to page outpage = pywikibot.Page(pywikibot.Site(), bot_config['ConfCSSoutput']) text = outpage.get() - outpage.put(text + u"\n== Simulation vom %s mit [%s code:%s] ==\n<pre>\n%s</pre>\n\n" % (pywikibot.Timestamp.now().isoformat(' '), link, rev, buffer)) + outpage.put( + text + u"\n== Simulation vom %s mit [%s code:%s] ==\n<pre>\n%s</pre>\n\n" + % (pywikibot.Timestamp.now().isoformat(' '), link, rev, buffer)) # comment = pywikibot.translate(self.site.lang, bot_config['msg'])) diff --git a/scripts/states_redirect.py b/scripts/states_redirect.py index 2ec6898..879df31 100644 --- a/scripts/states_redirect.py +++ b/scripts/states_redirect.py @@ -97,25 +97,24 @@ % goal) except pywikibot.IsNotRedirectPage: pywikibot.warning( - u"Page %s already exists and is not a redirect\ - Please check page!" + u"Page %s already exists and is not a redirect " + u"Please check page!" % pl.title()) except pywikibot.NoPage: change = '' if page.isRedirectPage(): p2 = page.getRedirectTarget() - pywikibot.output(u'Note: goal page is redirect.\ - Creating redirect ' u'to "%s" to avoid double\ - redirect.' % p2.title()) + pywikibot.output( + u'Note: goal page is redirect.\nCreating redirect ' + u'to "%s" to avoid double redirect.' % p2.title()) else: p2 = page if self.force: change = 'y' else: - change = pywikibot.input_choice(u'Create redirect\ - %s?' % pl.title(), - (('yes', 'y'), - ('no', 'n'))) + change = pywikibot.input_choice( + u'Create redirect %s?' % pl.title(), + (('yes', 'y'), ('no', 'n'))) if change == 'y': pl.text = '#REDIRECT [[%s]]' % p2.title() pl.save(i18n.translate(self.site, msg)) diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index 4bc522f..a94bb79 100644 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -139,7 +139,8 @@ # Other special cases re.compile('.*[\./(a)]gso\.gbv\.de(/.*)?'), # bot somehow can't handle their redirects - re.compile('.*[\./(a)]berlinonline\.de(/.*)?'), # a de: user wants to fix them by hand and doesn't want them to be deleted, see [[de:Benutzer:BLueFiSH.as/BZ]]. + re.compile('.*[\./(a)]berlinonline\.de(/.*)?'), + # above entry to be manually fixed per request at [[de:Benutzer:BLueFiSH.as/BZ]] re.compile('.*[\./(a)]bodo\.kommune\.no(/.*)?'), # bot can't handle their redirects re.compile('.*[\./(a)]jpl\.nasa\.gov(/.*)?'), # bot rejected on the site re.compile('.*[\./(a)]itis\.gov(/.*)?'), # bot rejected on the site diff --git a/tests/i18n/test.py b/tests/i18n/test.py index b2585f7..de5d92c 100644 --- a/tests/i18n/test.py +++ b/tests/i18n/test.py @@ -3,7 +3,9 @@ msg = { 'de': { 'test-plural': u'Bot: Ändere %(num)d {{PLURAL:num|Seite|Seiten}}.', - 'test-multiple-plurals': u'Bot: %(action)s %(line)s {{PLURAL:line|Zeile|Zeilen}} von {{PLURAL:%(page)d|einer|mehreren}} {{PLURAL:page|Seite|Seiten}}.', + 'test-multiple-plurals': + u'Bot: %(action)s %(line)s {{PLURAL:line|Zeile|Zeilen}} von ' + u'{{PLURAL:%(page)d|einer|mehreren}} {{PLURAL:page|Seite|Seiten}}.', }, 'en': { 'test-localized': u'test-localized EN', diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 2dec8dd..b6fc34d 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -760,12 +760,12 @@ def test_intersect_newpages_csd(self): site = self.get_site() - self.assertEqualItertools( - [pagegenerators.NewpagesPageGenerator(site=site, total=10), - pagegenerators.CategorizedPageGenerator( - pywikibot.Category(site, - 'Category:Candidates_for_speedy_deletion')) - ]) + self.assertEqualItertools([ + pagegenerators.NewpagesPageGenerator(site=site, total=10), + pagegenerators.CategorizedPageGenerator( + pywikibot.Category( + site, 'Category:Candidates_for_speedy_deletion'))] + ) class LiveRCPageGeneratorTestCase(WikimediaDefaultSiteTestCase): diff --git a/tox.ini b/tox.ini index 050b795..915cf18 100644 --- a/tox.ini +++ b/tox.ini @@ -136,10 +136,10 @@ [flake8] ignore = E122,E127,E241,E265 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* -max_line_length = 200 +max_line_length = 150 [pep8] ignore = E122,E127,E241 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* -max_line_length = 200 +max_line_length = 150 -- To view, visit https://gerrit.wikimedia.org/r/185647 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I28c15577df3857a04d820ccd2f5558d92450f424 Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [IMPROV] ui tests: Clean up tests - change (pywikibot/core)
by jenkins-bot (Code Review) 26 Jan '15

26 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] ui tests: Clean up tests ...................................................................... [IMPROV] ui tests: Clean up tests With 47c7cb5f07d59e0014db96e4a7ba40cd42d5d51d the ui_tests have been deindented. Originaly I planned to also do some other minor changes as git blame has been broken already be deindenting all of it. But because of a problem with the diff it didn't came so this are now the remaining changes. Mainly changing double quotes in single quotes, removing triple quotes (which weren't docstring) and remove the line length of one line. Change-Id: I1a678bc445a16a9180bed0049c3bc52b792f836b --- M tests/ui_tests.py 1 file changed, 108 insertions(+), 105 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/ui_tests.py b/tests/ui_tests.py index 9229769..08ddcb8 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -156,11 +156,12 @@ ui._print = org_print ui._raw_input = org_input + logger = logging.getLogger('pywiki') -loggingcontext = {'caller_name': "ui_tests", - 'caller_file': "ui_tests", +loggingcontext = {'caller_name': 'ui_tests', + 'caller_file': 'ui_tests', 'caller_line': 0, - 'newline': "\n"} + 'newline': '\n'} class UITestCase(unittest.TestCase): @@ -193,173 +194,173 @@ def testOutputLevels_logging_debug(self): logger.log(DEBUG, 'debug', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "") + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), '') def testOutputLevels_logging_verbose(self): logger.log(VERBOSE, 'verbose', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "") + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), '') def testOutputLevels_logging_info(self): logger.log(INFO, 'info', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "info\n") + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'info\n') def testOutputLevels_logging_stdout(self): logger.log(STDOUT, 'stdout', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "stdout\n") - self.assertEqual(newstderr.getvalue(), "") + self.assertEqual(newstdout.getvalue(), 'stdout\n') + self.assertEqual(newstderr.getvalue(), '') def testOutputLevels_logging_input(self): logger.log(INPUT, 'input', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "input\n") + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'input\n') def testOutputLevels_logging_WARNING(self): logger.log(WARNING, 'WARNING', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "WARNING: WARNING\n") + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'WARNING: WARNING\n') def testOutputLevels_logging_ERROR(self): logger.log(ERROR, 'ERROR', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "ERROR: ERROR\n") + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'ERROR: ERROR\n') def testOutputLevels_logging_CRITICAL(self): logger.log(CRITICAL, 'CRITICAL', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "CRITICAL: CRITICAL\n") + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'CRITICAL: CRITICAL\n') def test_output(self): - pywikibot.output("output", toStdout=False) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "output\n") + pywikibot.output('output', toStdout=False) + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'output\n') def test_output_stdout(self): - pywikibot.output("output", toStdout=True) - self.assertEqual(newstdout.getvalue(), "output\n") - self.assertEqual(newstderr.getvalue(), "") + pywikibot.output('output', toStdout=True) + self.assertEqual(newstdout.getvalue(), 'output\n') + self.assertEqual(newstderr.getvalue(), '') def test_warning(self): - pywikibot.warning("warning") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "WARNING: warning\n") + pywikibot.warning('warning') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'WARNING: warning\n') def test_error(self): - pywikibot.error("error") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "ERROR: error\n") + pywikibot.error('error') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'ERROR: error\n') def test_log(self): - pywikibot.log("log") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "") + pywikibot.log('log') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), '') def test_critical(self): - pywikibot.critical("critical") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "CRITICAL: critical\n") + pywikibot.critical('critical') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'CRITICAL: critical\n') def test_debug(self): - pywikibot.debug("debug", "test") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "") + pywikibot.debug('debug', 'test') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), '') def test_exception(self): class TestException(Exception): - """Test Exception.""" + """Test exception.""" try: - raise TestException("Testing Exception") + raise TestException('Testing Exception') except TestException: - pywikibot.exception("exception") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "ERROR: TestException: Testing Exception\n") + pywikibot.exception('exception') + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'ERROR: TestException: Testing Exception\n') def test_exception_tb(self): class TestException(Exception): - """Test Exception.""" + """Test exception.""" try: - raise TestException("Testing Exception") + raise TestException('Testing Exception') except TestException: - pywikibot.exception("exception", tb=True) - self.assertEqual(newstdout.getvalue(), "") - stderrlines = newstderr.getvalue().split("\n") - self.assertEqual(stderrlines[0], "ERROR: TestException: Testing Exception") - self.assertEqual(stderrlines[1], "Traceback (most recent call last):") - self.assertEqual(stderrlines[3], """ raise TestException("Testing Exception")""") + pywikibot.exception('exception', tb=True) + self.assertEqual(newstdout.getvalue(), '') + stderrlines = newstderr.getvalue().split('\n') + self.assertEqual(stderrlines[0], 'ERROR: TestException: Testing Exception') + self.assertEqual(stderrlines[1], 'Traceback (most recent call last):') + self.assertEqual(stderrlines[3], " raise TestException('Testing Exception')") self.assertTrue(stderrlines[4].endswith(': Testing Exception')) - self.assertNotEqual(stderrlines[-1], "\n") + self.assertNotEqual(stderrlines[-1], '\n') class TestTerminalInput(UITestCase): """Terminal input tests.""" - input_choice_output = "question ([A]nswer 1, a[n]swer 2, an[s]wer 3) " + input_choice_output = 'question ([A]nswer 1, a[n]swer 2, an[s]wer 3) ' def testInput(self): - newstdin.write("input to read\n") + newstdin.write('input to read\n') newstdin.seek(0) - returned = pywikibot.input("question") + returned = pywikibot.input('question') - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "question ") + self.assertEqual(newstdout.getvalue(), '') + self.assertEqual(newstderr.getvalue(), 'question ') self.assertIsInstance(returned, unicode) - self.assertEqual(returned, u"input to read") + self.assertEqual(returned, u'input to read') def _call_input_choice(self): rv = pywikibot.input_choice( - "question", + 'question', (('answer 1', u'A'), ('answer 2', u'N'), ('answer 3', u'S')), u'A', automatic_quit=False) - self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstdout.getvalue(), '') self.assertIsInstance(rv, unicode) return rv def testInputChoiceDefault(self): - newstdin.write("\n") + newstdin.write('\n') newstdin.seek(0) returned = self._call_input_choice() - self.assertEqual(returned, "a") + self.assertEqual(returned, 'a') def testInputChoiceCapital(self): - newstdin.write("N\n") + newstdin.write('N\n') newstdin.seek(0) returned = self._call_input_choice() self.assertEqual(newstderr.getvalue(), self.input_choice_output) - self.assertEqual(returned, "n") + self.assertEqual(returned, 'n') def testInputChoiceNonCapital(self): - newstdin.write("n\n") + newstdin.write('n\n') newstdin.seek(0) returned = self._call_input_choice() self.assertEqual(newstderr.getvalue(), self.input_choice_output) - self.assertEqual(returned, "n") + self.assertEqual(returned, 'n') def testInputChoiceIncorrectAnswer(self): - newstdin.write("X\nN\n") + newstdin.write('X\nN\n') newstdin.seek(0) returned = self._call_input_choice() @@ -367,10 +368,10 @@ self.assertEqual(newstderr.getvalue(), self.input_choice_output * 2) - self.assertEqual(returned, "n") + self.assertEqual(returned, 'n') -(a)unittest.skipUnless(os.name == "posix", "requires Unix console") +(a)unittest.skipUnless(os.name == 'posix', 'requires Unix console') class TestTerminalOutputColorUnix(UITestCase): """Terminal output color tests.""" @@ -379,7 +380,7 @@ def testOutputColorizedText(self): pywikibot.output(self.str1) - self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstdout.getvalue(), '') self.assertEqual( newstderr.getvalue(), 'text \x1b[95mlight purple text\x1b[0m text\n\x1b[0m') @@ -387,7 +388,7 @@ def testOutputNoncolorizedText(self): pywikibot.config.colorized_output = False pywikibot.output(self.str1) - self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstdout.getvalue(), '') self.assertEqual( newstderr.getvalue(), 'text light purple text text ***\n') @@ -399,7 +400,7 @@ @unittest.expectedFailure def testOutputColorCascade(self): pywikibot.output(self.str2) - self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstdout.getvalue(), '') self.assertEqual( newstderr.getvalue(), 'normal text \x1b[35;1m light purple ' + @@ -409,7 +410,7 @@ def testOutputColorCascade_incorrect(self): """ Test incorrect behavior of testOutputColorCascade. """ pywikibot.output(self.str2) - self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstdout.getvalue(), '') self.assertEqual( newstderr.getvalue(), 'normal text \x1b[95m light purple ' + @@ -417,14 +418,14 @@ '\x1b[0m normal text\n\x1b[0m') -(a)unittest.skipUnless(os.name == "posix", "requires Unix console") +(a)unittest.skipUnless(os.name == 'posix', 'requires Unix console') class TestTerminalUnicodeUnix(UITestCase): """Terminal output tests for unix.""" def testOutputUnicodeText(self): - pywikibot.output(u"Заглавная_страница") - self.assertEqual(newstdout.getvalue(), "") + pywikibot.output(u'Заглавная_страница') + self.assertEqual(newstdout.getvalue(), '') self.assertEqual( newstderr.getvalue(), self._encode(u'Заглавная_страница\n', 'utf-8')) @@ -433,18 +434,18 @@ newstdin.write(self._encode(u'Заглавная_страница\n', 'utf-8')) newstdin.seek(0) - returned = pywikibot.input(u"Википедию? ") + returned = pywikibot.input(u'Википедию? ') - self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstdout.getvalue(), '') self.assertEqual( newstderr.getvalue(), self._encode(u'Википедию? ', 'utf-8')) self.assertIsInstance(returned, unicode) - self.assertEqual(returned, u"Заглавная_страница") + self.assertEqual(returned, u'Заглавная_страница') -(a)unittest.skipUnless(os.name == "posix", "requires Unix console") +(a)unittest.skipUnless(os.name == 'posix', 'requires Unix console') class TestTransliterationUnix(UITestCase): """Terminal output transliteration tests.""" @@ -452,8 +453,8 @@ def testOutputTransliteratedUnicodeText(self): pywikibot.ui.encoding = 'latin-1' pywikibot.config.transliterate = True - pywikibot.output(u"abcd АБГД αβγδ あいうえお") - self.assertEqual(newstdout.getvalue(), "") + pywikibot.output(u'abcd АБГД αβγδ あいうえお') + self.assertEqual(newstdout.getvalue(), '') self.assertEqual( newstderr.getvalue(), 'abcd \x1b[93mA\x1b[0m\x1b[93mB\x1b[0m\x1b[93mG\x1b[0m' @@ -462,7 +463,7 @@ '\x1b[93mu\x1b[0m\x1b[93me\x1b[0m\x1b[93mo\x1b[0m\n\x1b[0m') -(a)unittest.skipUnless(os.name == "nt", "requires Windows console") +(a)unittest.skipUnless(os.name == 'nt', 'requires Windows console') class WindowsTerminalTestCase(UITestCase): """MS Windows terminal tests.""" @@ -486,7 +487,7 @@ cls._app.connect_(process=cls._process.pid) # set truetype font (Lucida Console, hopefully) - cls._app.window_().TypeKeys("% {UP}{ENTER}^L{HOME}L{ENTER}", with_spaces=True) + cls._app.window_().TypeKeys('% {UP}{ENTER}^L{HOME}L{ENTER}', with_spaces=True) @classmethod def tearDownProcess(cls): @@ -526,12 +527,12 @@ win32clipboard.OpenClipboard() data = win32clipboard.GetClipboardData(win32clipboard.CF_UNICODETEXT) win32clipboard.CloseClipboard() - data = data.split(u"\x00")[0] - data = data.replace(u"\r\n", u"\n") + data = data.split(u'\x00')[0] + data = data.replace(u'\r\n', u'\n') return data def sendstdin(self, text): - self.setclip(text.replace(u"\n", u"\r\n")) + self.setclip(text.replace(u'\n', u'\r\n')) self._app.window_().SetFocus() self.waitForWindow() self._app.window_().TypeKeys('% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{ENTER}', with_spaces=True) @@ -546,7 +547,7 @@ super(TestWindowsTerminalUnicode, cls).setUpClass() import inspect fn = inspect.getfile(inspect.currentframe()) - cls.setUpProcess(["python", "pwb.py", fn, "--run-as-slave-interpreter"]) + cls.setUpProcess(['python', 'pwb.py', fn, '--run-as-slave-interpreter']) _manager.connect() cls.pywikibot = _manager.pywikibot() @@ -568,24 +569,24 @@ self.pywikibot.cls() def testOutputUnicodeText_no_transliterate(self): - self.pywikibot.output(u"Заглавная_страница") - self.assertEqual(self.getstdouterr(), u"Заглавная_страница\n") + self.pywikibot.output(u'Заглавная_страница') + self.assertEqual(self.getstdouterr(), u'Заглавная_страница\n') def testOutputUnicodeText_transliterate(self): self.pywikibot.set_config('transliterate', True) self.pywikibot.set_ui('transliteration_target', 'latin-1') - self.pywikibot.output(u"Заглавная_страница") - self.assertEqual(self.getstdouterr(), "Zaglavnaya_stranica\n") + self.pywikibot.output(u'Заглавная_страница') + self.assertEqual(self.getstdouterr(), 'Zaglavnaya_stranica\n') def testInputUnicodeText(self): self.pywikibot.set_config('transliterate', True) - self.pywikibot.request_input(u"Википедию? ") - self.assertEqual(self.getstdouterr(), u"Википедию?") - self.sendstdin(u"Заглавная_страница\n") + self.pywikibot.request_input(u'Википедию? ') + self.assertEqual(self.getstdouterr(), u'Википедию?') + self.sendstdin(u'Заглавная_страница\n') returned = self.pywikibot.get_input() - self.assertEqual(returned, u"Заглавная_страница") + self.assertEqual(returned, u'Заглавная_страница') class TestWindowsTerminalUnicodeArguments(WindowsTerminalTestCase): @@ -595,7 +596,7 @@ @classmethod def setUpClass(cls): super(TestWindowsTerminalUnicodeArguments, cls).setUpClass() - cls.setUpProcess(["cmd", "/k", "echo off"]) + cls.setUpProcess(['cmd', '/k', 'echo off']) @classmethod def tearDownClass(cls): @@ -603,15 +604,17 @@ pass def testOutputUnicodeText_no_transliterate(self): - self.sendstdin(u"""python -c "import os, pywikibot; os.system('cls'); pywikibot.output(u'\\n'.join(pywikibot.handleArgs()))" Alpha Bετα Гамма دلتا\n""") - while(True): - lines = self.getstdouterr().split("\n") - if len(lines) >= 4 and lines[0] == "Alpha": - break + self.sendstdin( + u"python -c \"import os, pywikibot; os.system('cls'); " + u"pywikibot.output(u'\\n'.join(pywikibot.handleArgs()))\" " + u"Alpha Bετα Гамма دلتا\n") + lines = [] + while len(lines) < 4 or lines[0] != 'Alpha': + lines = self.getstdouterr().split('\n') time.sleep(1) # empty line is the new command line - self.assertEqual(lines, [u"Alpha", u"Bετα", u"Гамма", u"دلتا", u""]) + self.assertEqual(lines, [u'Alpha', u'Bετα', u'Гамма', u'دلتا', u'']) if __name__ == "__main__": -- To view, visit https://gerrit.wikimedia.org/r/186736 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a678bc445a16a9180bed0049c3bc52b792f836b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] QueryGen.set_namespace: no request param if empty - change (pywikibot/core)
by jenkins-bot (Code Review) 25 Jan '15

25 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: QueryGen.set_namespace: no request param if empty ...................................................................... QueryGen.set_namespace: no request param if empty If namespaces is None, [], or other empty iterator, assume the caller is not wanting to restrict the namespaces to 'no namespace', as that would prevent any data from being returned. Change-Id: I8224976fce0559c2663025d99dd86f55efe8e538 --- M pywikibot/data/api.py 1 file changed, 7 insertions(+), 2 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index 5d3b2ff..5cdc466 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1740,7 +1740,8 @@ @param namespaces: namespace identifiers to limit query results @type namespaces: iterable of basestring or Namespace key, or a single instance of those types. May be a '|' separated - list of namespace identifiers. + list of namespace identifiers. An empty iterator clears any + namespace restriction. @raises KeyError: a namespace identifier was not resolved @raises TypeError: a namespace identifier has an inappropriate type such as NoneType or bool, or more than one namespace @@ -1760,11 +1761,15 @@ namespaces = [ns.id for ns in pywikibot.site.Namespace.resolve(namespaces, self.site.namespaces)] + if 'multi' not in param and len(namespaces) != 1: raise TypeError(u'{0} module does not support multiple namespaces' .format(self.limited_module)) - self.request[self.prefix + "namespace"] = namespaces + if namespaces: + self.request[self.prefix + 'namespace'] = namespaces + elif self.prefix + 'namespace' in self.request: + del self.request[self.prefix + 'namespace'] def _query_continue(self): if all(key not in self.data[self.continue_name] -- To view, visit https://gerrit.wikimedia.org/r/186734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8224976fce0559c2663025d99dd86f55efe8e538 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2015