Pywikibot-commits September 2018

pywikibot-commits@lists.wikimedia.org

1 participants
191 discussions

[Gerrit] pywikibot/core[master]: [doc] Enable documentation generated for makecat.py script

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/458527 ) Change subject: [doc] Enable documentation generated for makecat.py script ...................................................................... [doc] Enable documentation generated for makecat.py script - put all global settings into main and use global variables for access - rename global variable "main" to "main_ns" - use pywikibot.handle_args(args) before handling local options Bug: T203675 Change-Id: I23f3bfb8cd0c8c7fbb027e38ab99d6f037ff7c14 --- M scripts/makecat.py 1 file changed, 45 insertions(+), 15 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/makecat.py b/scripts/makecat.py index fd73b7c..82f8b5e 100755 --- a/scripts/makecat.py +++ b/scripts/makecat.py @@ -58,10 +58,11 @@ """Bot tries to find new articles for a given category.""" - @classmethod - def needcheck(cls, pl): + @staticmethod + def needcheck(pl): """Verify whether the current page may be processed.""" - if main: + global main_ns, checked, skipdates + if main_ns: if pl.namespace() != 0: return False if pl in checked: @@ -79,6 +80,10 @@ def include(cls, pl, checklinks=True, realinclude=True, linkterm=None, summary=''): """Include the current page to the working category.""" + global mysite + global workingcat, parentcats, removeparent + global checkforward, checkbackward + global checked, tocheck cl = checklinks if linkterm: actualworkingcat = pywikibot.Category(mysite, workingcat.title(), @@ -125,6 +130,9 @@ @classmethod def asktoadd(cls, pl, summary): """Work on current page and ask to add article to category.""" + global mysite + global checked, tocheck + global excludefile if pl.site != mysite: return if pl.isRedirectPage(): @@ -201,17 +209,35 @@ pywikibot.output('Not understood.') -try: - checked = {} +def main(*args): + """ + Process command line arguments and invoke bot. + + If args is an empty list, sys.argv is used. + + @param args: command line arguments + @type args: list of unicode + """ + global main_ns, skipdates + global mysite + global workingcat, parentcats, removeparent + global checkforward, checkbackward + global checked, tocheck + global excludefile + + main_ns = True skipdates = False + removeparent = True checkforward = True checkbackward = True - checkbroken = True - removeparent = True - main = True - workingcatname = '' + checked = {} tocheck = DequeGenerator() - for arg in pywikibot.handle_args(): + + checkbroken = True + workingcatname = '' + + local_args = pywikibot.handle_args(args) + for arg in local_args: if arg.startswith('-nodate'): skipdates = True elif arg.startswith('-forward'): @@ -222,7 +248,7 @@ elif arg.startswith('-keepparent'): removeparent = False elif arg.startswith('-all'): - main = False + main_ns = False elif not workingcatname: workingcatname = arg @@ -296,8 +322,12 @@ if checkbroken or page.exists(): MakeCatBot.asktoadd(page, summary) -finally: + +if __name__ == '__main__': try: - excludefile.close() - except Exception: - pass + main() + finally: + try: + excludefile.close() + except Exception: + pass -- To view, visit https://gerrit.wikimedia.org/r/458527 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I23f3bfb8cd0c8c7fbb027e38ab99d6f037ff7c14 Gerrit-Change-Number: 458527 Gerrit-PatchSet: 2 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 (75)

5 years, 8 months

[Gerrit] pywikibot/core[master]: textlib._tag_pattern: Do not mistake self-closing tags with start tag

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/458636 ) Change subject: textlib._tag_pattern: Do not mistake self-closing tags with start tag ...................................................................... textlib._tag_pattern: Do not mistake self-closing tags with start tag Bug: T203568 Change-Id: I58ac107691b2c6866d2b7568983e8760f7e6683a --- M pywikibot/textlib.py M tests/textlib_tests.py 2 files changed, 14 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index c9d416b..b58ae27 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -258,7 +258,11 @@ def _tag_pattern(tag_name): """Return a tag pattern for the given tag name.""" - return r'<{0}[ >][\s\S]*?</{0}\s*>'.format(_ignore_case(tag_name)) + return ( + r'<{0}(?:>|\s+[^>]*(?<!/)>)' # start tag + r'[\s\S]*?' # contents + r'</{0}\s*>' # end tag + .format(_ignore_case(tag_name))) def _tag_regex(tag_name): diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 67db849..0e56cc8 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1216,6 +1216,15 @@ self.assertEqual(textlib.replaceExcept('{{#invoke:x}}', 'x', 'y', ['invoke'], site=self.site), '{{#invoke:x}}') + self.assertEqual( + textlib.replaceExcept( + '<ref name=etwa /> not_in_ref <ref> in_ref </ref>', + 'not_in_ref', 'text', ['ref'], site=self.site), + '<ref name=etwa /> text <ref> in_ref </ref>') + self.assertEqual( + textlib.replaceExcept( + '<ab> content </a>', 'content', 'text', ['a'], site=self.site), + '<ab> text </a>') def test_replace_with_count(self): """Test replacing with count argument.""" -- To view, visit https://gerrit.wikimedia.org/r/458636 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I58ac107691b2c6866d2b7568983e8760f7e6683a Gerrit-Change-Number: 458636 Gerrit-PatchSet: 3 Gerrit-Owner: 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 (75)

5 years, 8 months

[Gerrit] pywikibot/core[master]: [IMPR] Improvements for makecat.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/458506 ) Change subject: [IMPR] Improvements for makecat.py ...................................................................... [IMPR] Improvements for makecat.py - declare needcheck, include and asktoadd as classmethods - global variables are kept and the script is mainly unchanged - add needed doc string and enable D103 PEP checking 1st step detached from Id7ca3461d for easier reviewing Change-Id: I27d7da12c97d98ba5cd72e192ef3bbce968d1f63 --- M scripts/makecat.py M tox.ini 2 files changed, 143 insertions(+), 127 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/makecat.py b/scripts/makecat.py index 25331a9..fd73b7c 100755 --- a/scripts/makecat.py +++ b/scripts/makecat.py @@ -48,140 +48,157 @@ import pywikibot +from pywikibot.bot import NoRedirectPageBot, SingleSiteBot from pywikibot import pagegenerators, i18n, textlib from pywikibot.tools import DequeGenerator -def needcheck(pl): - if main: - if pl.namespace() != 0: - return False - if pl in checked: - return False - if skipdates: - if pl.autoFormat()[0] is not None: - return False - return True +class MakeCatBot(SingleSiteBot, NoRedirectPageBot): + """Bot tries to find new articles for a given category.""" -def include(pl, checklinks=True, realinclude=True, linkterm=None, summary=''): - cl = checklinks - if linkterm: - actualworkingcat = pywikibot.Category(mysite, workingcat.title(), - sort_key=linkterm) - else: - actualworkingcat = workingcat - if realinclude: - try: - text = pl.get() - except pywikibot.NoPage: - pass - except pywikibot.IsRedirectPage: - cl = True + @classmethod + def needcheck(cls, pl): + """Verify whether the current page may be processed.""" + if main: + if pl.namespace() != 0: + return False + if pl in checked: + return False + if skipdates: + if pl.autoFormat()[0] is not None: + return False + return True + + def change_category(self, page, catlist): + """Change the category of page.""" + pass + + @classmethod + def include(cls, pl, checklinks=True, realinclude=True, linkterm=None, + summary=''): + """Include the current page to the working category.""" + cl = checklinks + if linkterm: + actualworkingcat = pywikibot.Category(mysite, workingcat.title(), + sort_key=linkterm) else: - cats = [x for x in pl.categories()] - if workingcat not in cats: - cats = [x for x in pl.categories()] - for c in cats: - if c in parentcats: - if removeparent: - pl.change_category(actualworkingcat, - summary=summary) - break - else: - pl.put(textlib.replaceCategoryLinks( - text, cats + [actualworkingcat], site=pl.site), - summary=summary) - if cl: - if checkforward: - for page2 in pl.linkedPages(): - if needcheck(page2): - tocheck.append(page2) - checked[page2] = page2 - if checkbackward: - for ref_page in pl.getReferences(): - if needcheck(ref_page): - tocheck.append(ref_page) - checked[ref_page] = ref_page - - -def asktoadd(pl, summary): - if pl.site != mysite: - return - if pl.isRedirectPage(): - pl2 = pl.getRedirectTarget() - if needcheck(pl2): - tocheck.append(pl2) - checked[pl2] = pl2 - return - ctoshow = 500 - pywikibot.output('') - pywikibot.output('== {} =='.format(pl.title())) - while True: - # TODO: Use pywikibot.inputChoice? - # (needs the support for 'other options') - answer = pywikibot.input('[y]es/[n]o/[i]gnore/[o]ther options?') - if answer == 'y': - include(pl, summary=summary) - break - if answer == 'c': - include(pl, realinclude=False) - break - if answer == 'z': - if pl.exists(): - if not pl.isRedirectPage(): - linkterm = pywikibot.input( - 'In what manner should it be alphabetized?') - include(pl, linkterm=linkterm, summary=summary) - break - include(pl, summary=summary) - break - elif answer == 'n': - excludefile.write('%s\n' % pl.title()) - break - elif answer == 'i': - break - elif answer == 'o': - pywikibot.output('t: Give the beginning of the text of the page') - pywikibot.output( - 'z: Add under another title (as [[Category|Title]])') - pywikibot.output( - 'x: Add the page, but do not check links to and from it') - pywikibot.output('c: Do not add the page, but do check links') - pywikibot.output('a: Add another page') - pywikibot.output('l: Give a list of the pages to check') - elif answer == 'a': - pagetitle = pywikibot.input('Specify page to add:') - page = pywikibot.Page(pywikibot.Site(), pagetitle) - if page not in checked.keys(): - include(page, summary=summary) - elif answer == 'x': - if pl.exists(): - if pl.isRedirectPage(): - pywikibot.output( - 'Redirect page. Will be included normally.') - include(pl, realinclude=False) - else: - include(pl, checklinks=False, summary=summary) - else: - pywikibot.output('Page does not exist; not added.') - break - elif answer == 'l': - pywikibot.output('Number of pages still to check: {}' - .format(len(tocheck))) - pywikibot.output('Pages to be checked:') - pywikibot.output(' - '.join(page.title() for page in tocheck)) - pywikibot.output('== {} =='.format(pl.title())) - elif answer == 't': - pywikibot.output('== {} =='.format(pl.title())) + actualworkingcat = workingcat + if realinclude: try: - pywikibot.output('' + pl.get(get_redirect=True)[0:ctoshow]) + text = pl.get() except pywikibot.NoPage: - pywikibot.output('Page does not exist.') - ctoshow += 500 - else: - pywikibot.output('Not understood.') + pass + except pywikibot.IsRedirectPage: + cl = True + else: + cats = [x for x in pl.categories()] + if workingcat not in cats: + cats = [x for x in pl.categories()] + for c in cats: + if c in parentcats: + if removeparent: + pl.change_category(actualworkingcat, + summary=summary) + break + else: + pl.put(textlib.replaceCategoryLinks( + text, cats + [actualworkingcat], site=pl.site), + summary=summary) + if cl: + if checkforward: + for page2 in pl.linkedPages(): + if cls.needcheck(page2): + tocheck.append(page2) + checked[page2] = page2 + if checkbackward: + for ref_page in pl.getReferences(): + if cls.needcheck(ref_page): + tocheck.append(ref_page) + checked[ref_page] = ref_page + + def skip_page(self, page): + """Check whether the page is to be skipped.""" + pass + + @classmethod + def asktoadd(cls, pl, summary): + """Work on current page and ask to add article to category.""" + if pl.site != mysite: + return + if pl.isRedirectPage(): + pl2 = pl.getRedirectTarget() + if cls.needcheck(pl2): + tocheck.append(pl2) + checked[pl2] = pl2 + return + ctoshow = 500 + pywikibot.output('') + pywikibot.output('== {} =='.format(pl.title())) + while True: + answer = pywikibot.input('[y]es/[n]o/[i]gnore/[o]ther options?') + if answer == 'y': + cls.include(pl, summary=summary) + break + if answer == 'c': + cls.include(pl, realinclude=False) + break + if answer == 'z': + if pl.exists(): + if not pl.isRedirectPage(): + linkterm = pywikibot.input( + 'In what manner should it be alphabetized?') + cls.include(pl, linkterm=linkterm, summary=summary) + break + cls.include(pl, summary=summary) + break + elif answer == 'n': + excludefile.write('%s\n' % pl.title()) + break + elif answer == 'i': + break + elif answer == 'o': + pywikibot.output( + 't: Give the beginning of the text of the page') + pywikibot.output( + 'z: Add under another title (as [[Category|Title]])') + pywikibot.output( + 'x: Add the page, but do not check links to and from it') + pywikibot.output('c: Do not add the page, but do check links') + pywikibot.output('a: Add another page') + pywikibot.output('l: Give a list of the pages to check') + elif answer == 'a': + pagetitle = pywikibot.input('Specify page to add:') + page = pywikibot.Page(pywikibot.Site(), pagetitle) + if page not in checked.keys(): + cls.include(page, summary=summary) + elif answer == 'x': + if pl.exists(): + if pl.isRedirectPage(): + pywikibot.output( + 'Redirect page. Will be included normally.') + cls.include(pl, realinclude=False) + else: + cls.include(pl, checklinks=False, summary=summary) + else: + pywikibot.output('Page does not exist; not added.') + break + elif answer == 'l': + pywikibot.output('Number of pages still to check: {}' + .format(len(tocheck))) + pywikibot.output('Pages to be checked:') + pywikibot.output(' - '.join(page.title() for page in tocheck)) + pywikibot.output('== {} =='.format(pl.title())) + elif answer == 't': + pywikibot.output('== {} =='.format(pl.title())) + try: + pywikibot.output('' + pl.get(get_redirect=True)[0:ctoshow]) + except pywikibot.NoPage: + pywikibot.output('Page does not exist.') + ctoshow += 500 + else: + pywikibot.output('Not understood.') try: @@ -271,13 +288,13 @@ for pl in articles: checked[pl] = pl - include(pl, summary=summary) + MakeCatBot.include(pl, summary=summary) gen = pagegenerators.DequePreloadingGenerator(tocheck) for page in gen: if checkbroken or page.exists(): - asktoadd(page, summary) + MakeCatBot.asktoadd(page, summary) finally: try: diff --git a/tox.ini b/tox.ini index ead11e1..7847107 100644 --- a/tox.ini +++ b/tox.ini @@ -227,7 +227,6 @@ scripts/interwiki.py : N803, N806, N802 scripts/isbn.py : N803, N806, N802 scripts/maintenance/* : T001 - scripts/makecat.py : D103 scripts/match_images.py : N803, N806 scripts/misspelling.py : N803, N806, N802 scripts/movepages.py : N803, N806, N802 -- To view, visit https://gerrit.wikimedia.org/r/458506 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I27d7da12c97d98ba5cd72e192ef3bbce968d1f63 Gerrit-Change-Number: 458506 Gerrit-PatchSet: 5 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 (75)

5 years, 8 months

[Gerrit] pywikibot/core[master]: [cleanup] cleanup script code

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/458491 ) Change subject: [cleanup] cleanup script code ...................................................................... [cleanup] cleanup script code - remove preleading "u" from strings - use single quotes for string constants - use str.format() instead of modulo operator for changed lines - keep lines beneath 80 chars Detached from Icd4c6a5625 Change-Id: I39f9d4d15d5bc0bf7e84575337826a2ef801832f --- M scripts/makecat.py 1 file changed, 27 insertions(+), 27 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/makecat.py b/scripts/makecat.py index 743a67b..25331a9 100755 --- a/scripts/makecat.py +++ b/scripts/makecat.py @@ -116,12 +116,12 @@ checked[pl2] = pl2 return ctoshow = 500 - pywikibot.output(u'') - pywikibot.output(u"==%s==" % pl.title()) + pywikibot.output('') + pywikibot.output('== {} =='.format(pl.title())) while True: # TODO: Use pywikibot.inputChoice? # (needs the support for 'other options') - answer = pywikibot.input("[y]es/[n]o/[i]gnore/[o]ther options?") + answer = pywikibot.input('[y]es/[n]o/[i]gnore/[o]ther options?') if answer == 'y': include(pl, summary=summary) break @@ -132,7 +132,7 @@ if pl.exists(): if not pl.isRedirectPage(): linkterm = pywikibot.input( - u"In what manner should it be alphabetized?") + 'In what manner should it be alphabetized?') include(pl, linkterm=linkterm, summary=summary) break include(pl, summary=summary) @@ -143,16 +143,16 @@ elif answer == 'i': break elif answer == 'o': - pywikibot.output(u"t: Give the beginning of the text of the page") + pywikibot.output('t: Give the beginning of the text of the page') pywikibot.output( - u"z: Add under another title (as [[Category|Title]])") + 'z: Add under another title (as [[Category|Title]])') pywikibot.output( - u"x: Add the page, but do not check links to and from it") - pywikibot.output(u"c: Do not add the page, but do check links") - pywikibot.output(u"a: Add another page") - pywikibot.output(u"l: Give a list of the pages to check") + 'x: Add the page, but do not check links to and from it') + pywikibot.output('c: Do not add the page, but do check links') + pywikibot.output('a: Add another page') + pywikibot.output('l: Give a list of the pages to check') elif answer == 'a': - pagetitle = pywikibot.input("Specify page to add:") + pagetitle = pywikibot.input('Specify page to add:') page = pywikibot.Page(pywikibot.Site(), pagetitle) if page not in checked.keys(): include(page, summary=summary) @@ -160,28 +160,28 @@ if pl.exists(): if pl.isRedirectPage(): pywikibot.output( - u"Redirect page. Will be included normally.") + 'Redirect page. Will be included normally.') include(pl, realinclude=False) else: include(pl, checklinks=False, summary=summary) else: - pywikibot.output(u"Page does not exist; not added.") + pywikibot.output('Page does not exist; not added.') break elif answer == 'l': - pywikibot.output(u"Number of pages still to check: %s" - % len(tocheck)) - pywikibot.output(u"Pages to be checked:") - pywikibot.output(u" - ".join(page.title() for page in tocheck)) - pywikibot.output(u"==%s==" % pl.title()) + pywikibot.output('Number of pages still to check: {}' + .format(len(tocheck))) + pywikibot.output('Pages to be checked:') + pywikibot.output(' - '.join(page.title() for page in tocheck)) + pywikibot.output('== {} =='.format(pl.title())) elif answer == 't': - pywikibot.output(u"==%s==" % pl.title()) + pywikibot.output('== {} =='.format(pl.title())) try: - pywikibot.output(u'' + pl.get(get_redirect=True)[0:ctoshow]) + pywikibot.output('' + pl.get(get_redirect=True)[0:ctoshow]) except pywikibot.NoPage: - pywikibot.output(u"Page does not exist.") + pywikibot.output('Page does not exist.') ctoshow += 500 else: - pywikibot.output(u"Not understood.") + pywikibot.output('Not understood.') try: @@ -259,13 +259,13 @@ # in a diferent category. articles = list(workingcat.articles(content=True)) if not articles: - pywikibot.output( - u"Category %s does not exist or is empty. Which page to start with?" - % workingcatname) - answer = pywikibot.input(u"(Default is [[%s]]):" % workingcatname) + pywikibot.output('Category {} does not exist or is empty. ' + 'Which page to start with?' + .format(workingcatname)) + answer = pywikibot.input('(Default is [[{}]]):'.format(workingcatname)) if not answer: answer = workingcatname - pywikibot.output(u'' + answer) + pywikibot.output('' + answer) pl = pywikibot.Page(mysite, answer) articles = [pl] -- To view, visit https://gerrit.wikimedia.org/r/458491 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I39f9d4d15d5bc0bf7e84575337826a2ef801832f Gerrit-Change-Number: 458491 Gerrit-PatchSet: 1 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 (75)

5 years, 8 months

[Gerrit] pywikibot/core[master]: page.Link.langlinkUnsafe: Always set _namespace to a Namespace object

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/458359 ) Change subject: page.Link.langlinkUnsafe: Always set _namespace to a Namespace object ...................................................................... page.Link.langlinkUnsafe: Always set _namespace to a Namespace object APISite.pagelanglinks creates link objects using Link.langlinkUnsafe. If the links was in the main namespace, Page(link).namespace() was an int object which caused attribute errors. Fix the docstring of NamespacesDict.__getattr__. Bug: T203491 Change-Id: Ic2ab6707a88f2980049b92517cb98713f9e6a14e --- M pywikibot/page.py M pywikibot/site.py 2 files changed, 4 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index a249933..126fb95 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -5897,14 +5897,14 @@ link._section = None link._source = source - link._namespace = 0 - + link._namespace = link._site.namespaces[0] if ':' in title: ns, t = title.split(':', 1) ns = link._site.namespaces.lookup_name(ns) if ns: link._namespace = ns title = t + if u"#" in title: t, sec = title.split(u'#', 1) title, link._section = t.rstrip(), sec.lstrip() diff --git a/pywikibot/site.py b/pywikibot/site.py index d48f808..5ac00c9 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -543,8 +543,8 @@ """ Get the namespace with the given key. - @param key: namespace key - @type key: Namespace, int or str + @param attr: namespace key + @type attr: Namespace, int or str @rtype: Namespace """ # lookup_name access _namespaces -- To view, visit https://gerrit.wikimedia.org/r/458359 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic2ab6707a88f2980049b92517cb98713f9e6a14e Gerrit-Change-Number: 458359 Gerrit-PatchSet: 6 Gerrit-Owner: 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 (75)

5 years, 8 months

[Gerrit] pywikibot/core[master]: [IMPR] Adjust BaseBot._savecounter for RedirectRobot

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/456999 ) Change subject: [IMPR] Adjust BaseBot._savecounter for RedirectRobot ...................................................................... [IMPR] Adjust BaseBot._savecounter for RedirectRobot Bug: T196851 Bug: T203358 Change-Id: Ib5ba25f04e9fd009cffa74fe8a547a76c8cb2c26 --- M scripts/redirect.py 1 file changed, 11 insertions(+), 44 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/redirect.py b/scripts/redirect.py index e417993..b4cd567 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -482,10 +482,9 @@ page.title(with_section=False)) content = content_page.get(get_redirect=True) content = self.sdtemplate + '\n' + content - try: - page.put(content, reason) - except pywikibot.PageSaveRelatedError as e: - pywikibot.error(e) + self.userPut(page, content, page.text, summary=reason, + ignore_save_related_errors=True, + ignore_server_errors=True) def delete_1_broken_redirect(self): """Treat one broken redirect.""" @@ -532,25 +531,11 @@ content = redir_page.get(get_redirect=True) redir_page.set_redirect_target( movedTarget, keep_section=True, save=False) - pywikibot.showDiff(content, redir_page.text) - pywikibot.output(u'Summary - %s' % reason) - if self.user_confirm( - u'Redirect target %s has been moved to %s.\n' - u'Do you want to fix %s?' - % (targetPage, movedTarget, redir_page)): - try: - redir_page.save(reason) - except pywikibot.NoUsername: - pywikibot.output(u"Page [[%s]] not saved; " - u"sysop privileges required." - % redir_page.title()) - except pywikibot.LockedPage: - pywikibot.output(u'%s is locked.' - % redir_page.title()) - except pywikibot.PageSaveRelatedError: - pywikibot.exception() - else: - done = True + pywikibot.output('Summary - ' + reason) + done = self.userPut(redir_page, content, + redir_page.text, summary=reason, + ignore_save_related_errors=True, + ignore_server_errors=True) if not done and self.user_confirm( u'Redirect target %s does not exist.\n' u'Do you want to delete %s?' @@ -675,27 +660,9 @@ summary = i18n.twtranslate(self.site, 'redirect-fix-double', {'to': targetPage.title(as_link=True)} ) - pywikibot.showDiff(oldText, redir.text) - if self.user_confirm(u'Do you want to accept the changes?'): - try: - redir.save(summary) - except pywikibot.LockedPage: - pywikibot.output(u'%s is locked.' % redir.title()) - except pywikibot.SpamfilterError as error: - pywikibot.output( - u"Saving page [[%s]] prevented by spam filter: %s" - % (redir.title(), error.url)) - except pywikibot.PageNotSaved as error: - pywikibot.output(u"Saving page [[%s]] failed: %s" - % (redir.title(), error)) - except pywikibot.NoUsername: - pywikibot.output( - u"Page [[%s]] not saved; sysop privileges required." - % redir.title()) - except pywikibot.Error as error: - pywikibot.output( - u"Unexpected error occurred trying to save [[%s]]: %s" - % (redir.title(), error)) + self.userPut(redir, oldText, redir.text, summary=summary, + ignore_save_related_errors=True, + ignore_server_errors=True) break def fix_double_or_delete_broken_redirect(self): -- To view, visit https://gerrit.wikimedia.org/r/456999 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib5ba25f04e9fd009cffa74fe8a547a76c8cb2c26 Gerrit-Change-Number: 456999 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 8 months

[Gerrit] pywikibot/core[master]: [bugfix] enable Namespace.content for mw < 1.16

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/458145 ) Change subject: [bugfix] enable Namespace.content for mw < 1.16 ...................................................................... [bugfix] enable Namespace.content for mw < 1.16 Bug: T203491 Change-Id: I7bc12a28c82f59f8159976ce996f6671ba23927f --- M pywikibot/site.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index be63f15..4d22d01 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2648,6 +2648,9 @@ if is_mw114: canonical_name = nsdata.pop('canonical') + if 'content' not in nsdata: # mw < 1.16 + nsdata['content'] = ns == 0 + default_case = Namespace.default_case(ns) if 'case' not in nsdata: nsdata['case'] = default_case or self.siteinfo['case'] -- To view, visit https://gerrit.wikimedia.org/r/458145 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7bc12a28c82f59f8159976ce996f6671ba23927f Gerrit-Change-Number: 458145 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 8 months

[Gerrit] pywikibot/core[master]: [IMPR] Allow terminating the bot generator

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/443849 ) Change subject: [IMPR] Allow terminating the bot generator ...................................................................... [IMPR] Allow terminating the bot generator - Introduce BaseBot.stop which raises a GeneratorExit exception to allow the BaseBot.generator to be stopped in such cases if generator.close() is not available. - Let BaseBot.run recognize the GeneratorExit exception to stop the loop. - Use the stop method in redirect.py Bug: T198801 Change-Id: I97959f9d59a67439cd4ea8ac89a4980cd5d093b4 --- M pywikibot/bot.py M scripts/redirect.py 2 files changed, 7 insertions(+), 1 deletion(-) Approvals: jenkins-bot: Verified Framawiki: Looks good to me, approved diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 51ad1bc..de27fe0 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1363,6 +1363,10 @@ return True return False + def stop(self): + """Stop iterating.""" + raise GeneratorExit + def quit(self): """Cleanup and quit processing.""" raise QuitKeyboardInterrupt @@ -1512,6 +1516,8 @@ % (self.__class__.__name__, sys.maxint)) else: self._generator_completed = True + except GeneratorExit: + pywikibot.output('Generator has been stopped.') except QuitKeyboardInterrupt: pywikibot.output('\nUser quit %s bot run...' % self.__class__.__name__) diff --git a/scripts/redirect.py b/scripts/redirect.py index baa6286..3d6fd2f 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -711,7 +711,7 @@ if self._treat_counter >= self.getOption('total'): pywikibot.output('\nNumber of pages reached the total limit. ' 'Script terminated.') - self.quit() + self.stop() super(RedirectRobot, self).treat(page) -- To view, visit https://gerrit.wikimedia.org/r/443849 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I97959f9d59a67439cd4ea8ac89a4980cd5d093b4 Gerrit-Change-Number: 443849 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: Dvorapa <dvorapa(a)seznam.cz>

5 years, 8 months

[Gerrit] pywikibot/core[master]: [CLEANUP] use current_page directly in action treat

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/457308 ) Change subject: [CLEANUP] use current_page directly in action treat ...................................................................... [CLEANUP] use current_page directly in action treat - Therefore connect the action treat to treat_page and remove their positional arguments. Change-Id: I7c5ef58e99c75d641b394cf1320b1dc22d4a9f0f --- M scripts/redirect.py 1 file changed, 16 insertions(+), 17 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/redirect.py b/scripts/redirect.py index 59a00c9..baa6286 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -417,13 +417,13 @@ self.exiting = False self.sdtemplate = self.get_sd_template() - # connect the action treat + # connect the action treat to treat_page method called by treat if action == 'double': - self.action_treat = self.fix_1_double_redirect + self.treat_page = self.fix_1_double_redirect elif action == 'broken': - self.action_treat = self.delete_1_broken_redirect + self.treat_page = self.delete_1_broken_redirect elif action == 'both': - self.action_treat = self.fix_double_or_delete_broken_redirect + self.treat_page = self.fix_double_or_delete_broken_redirect else: raise NotImplementedError('No valid action "{0}" found.' ''.format(action)) @@ -488,8 +488,9 @@ except pywikibot.PageSaveRelatedError as e: pywikibot.error(e) - def delete_1_broken_redirect(self, redir_page): + def delete_1_broken_redirect(self): """Treat one broken redirect.""" + redir_page = self.current_page done = not self.getOption('delete') try: targetPage = redir_page.getRedirectTarget() @@ -575,9 +576,9 @@ "Won't delete anything." if self.getOption('delete') else "Skipping.")) - def fix_1_double_redirect(self, redir): + def fix_1_double_redirect(self): """Treat one double redirect.""" - newRedir = redir + newRedir = redir = self.current_page redirList = [] # bookkeeping to detect loops while True: redirList.append(u'%s:%s' % (newRedir.site.lang, @@ -698,22 +699,20 @@ % (redir.title(), error)) break - def fix_double_or_delete_broken_redirect(self, page): + def fix_double_or_delete_broken_redirect(self): """Treat one broken or double redirect.""" - if page._redirect_type == 1: - return - if page._redirect_type == 0: - self.delete_1_broken_redirect(page) - else: - self.fix_1_double_redirect(page) + if self.current_page._redirect_type == 0: + self.delete_1_broken_redirect() + elif self.current_page._redirect_type != 1: + self.fix_1_double_redirect() - def treat_page(self): - """Treat current page.""" + def treat(self, page): + """Treat a page.""" if self._treat_counter >= self.getOption('total'): pywikibot.output('\nNumber of pages reached the total limit. ' 'Script terminated.') self.quit() - self.action_treat(self.current_page) + super(RedirectRobot, self).treat(page) def main(*args): -- To view, visit https://gerrit.wikimedia.org/r/457308 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I7c5ef58e99c75d641b394cf1320b1dc22d4a9f0f Gerrit-Change-Number: 457308 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 8 months

[Gerrit] pywikibot/core[master]: Allow bot parameter in set_redirect_target

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/336882 ) Change subject: Allow bot parameter in set_redirect_target ...................................................................... Allow bot parameter in set_redirect_target Change-Id: Ia0c44aeff7961c1a42c53a36134ef2ff590b00b2 --- M pywikibot/page.py M pywikibot/site.py 2 files changed, 7 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 0771788..a249933 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4607,7 +4607,8 @@ if not save or keep_section or create: raise NotImplementedError data = self.repo.set_redirect_target( - from_item=self, to_item=target_page) + from_item=self, to_item=target_page, + bot=kwargs.get('botflag', True)) if data.get('success', 0): del self.latest_revision_id self._isredir = True diff --git a/pywikibot/site.py b/pywikibot/site.py index be63f15..e063133 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -8089,7 +8089,7 @@ return data @must_be(group='user') - def set_redirect_target(self, from_item, to_item): + def set_redirect_target(self, from_item, to_item, bot=True): """ Make a redirect to another item. @@ -8097,12 +8097,15 @@ @type to_item: pywikibot.ItemPage @param from_item: Title of the item to be redirected. @type from_item: pywikibot.ItemPage + @param bot: Whether to mark the edit as a bot edit + @type bot: bool """ params = { 'action': 'wbcreateredirect', 'from': from_item.getID(), 'to': to_item.getID(), - 'token': self.tokens['edit'] + 'token': self.tokens['edit'], + 'bot': bot, } req = self._simple_request(**params) data = req.submit() -- To view, visit https://gerrit.wikimedia.org/r/336882 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia0c44aeff7961c1a42c53a36134ef2ff590b00b2 Gerrit-Change-Number: 336882 Gerrit-PatchSet: 7 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits September 2018