Pywikibot-commits February 2015

pywikibot-commits@lists.wikimedia.org

2 participants
126 discussions

Fixed: wikimedia/pywikibot-core#2014 (master - 33a1c48)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2014 Status: Fixed Duration: 53 minutes and 51 seconds Commit: 33a1c48 (master) Author: VcamX Message: Postpone botflag checking in Page Postpone botflag checking of save() in Page to editpage() in Site. bug: T57140 Change-Id: I07b50032846423d38bfd976656d7f8001074de2c View the changeset: https://github.com/wikimedia/pywikibot-core/compare/166e47d111e7...33a1c481… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/51699288 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 2 months

[Gerrit] Postpone botflag checking in Page - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Postpone botflag checking in Page ...................................................................... Postpone botflag checking in Page Postpone botflag checking of save() in Page to editpage() in Site. bug: T57140 Change-Id: I07b50032846423d38bfd976656d7f8001074de2c --- M pywikibot/page.py M pywikibot/site.py 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Nullzero: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index e7a4a91..1f4c866 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1026,8 +1026,6 @@ if not force and not self.botMayEdit(): raise pywikibot.OtherPageSaveError( self, "Editing restricted by {{bots}} template") - if botflag is None: - botflag = ("bot" in self.site.userinfo["rights"]) if async: pywikibot.async_request(self._save, comment=comment, minor=minor, watchval=watchval, botflag=botflag, diff --git a/pywikibot/site.py b/pywikibot/site.py index 4bc67d7..2c36ffa 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -4068,6 +4068,8 @@ if not recreate: raise token = self.tokens['edit'] + if bot is None: + bot = ("bot" in self.userinfo["rights"]) self.lock_page(page) params = dict(action="edit", title=page.title(withSection=False), -- To view, visit https://gerrit.wikimedia.org/r/192178 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I07b50032846423d38bfd976656d7f8001074de2c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: VcamX <vcamx3(a)gmail.com> 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: Nullzero <nullzero.free(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

9 years, 2 months

Failed: wikimedia/pywikibot-core#2013 (master - 166e47d)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2013 Status: Failed Duration: 47 minutes and 3 seconds Commit: 166e47d (master) Author: Fabian Neundorf Message: [FIX] Normalize username This normalizes the username before site instantiation, so that the site instances are all use the same username. It also further normalizes the username for the password cache. Bug: T73398 Change-Id: I4fd4cca7d65f07d83bf21659a8c10a52c54d7747 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/9b26056393df...166e47d1… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/51660276 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 2 months

[Gerrit] [FIX] Normalize username - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] Normalize username ...................................................................... [FIX] Normalize username This normalizes the username before site instantiation, so that the site instances are all use the same username. It also further normalizes the username for the password cache. Bug: T73398 Change-Id: I4fd4cca7d65f07d83bf21659a8c10a52c54d7747 --- M pywikibot/__init__.py M pywikibot/login.py M pywikibot/site.py M pywikibot/tools/__init__.py 4 files changed, 13 insertions(+), 14 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 53aaa13..d4b3081 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -598,6 +598,7 @@ if not issubclass(interface, pywikibot.site.BaseSite): warning('Site called with interface=%s' % interface.__name__) + user = pywikibot.tools.normalize_username(user) key = '%s:%s:%s:%s' % (interface.__name__, fam, code, user) if key not in _sites or not isinstance(_sites[key], interface): _sites[key] = interface(code=code, fam=fam, user=user, sysop=sysop) diff --git a/pywikibot/login.py b/pywikibot/login.py index 816378f..b2ace77 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -14,7 +14,7 @@ import pywikibot from pywikibot import config -from pywikibot.tools import deprecated_args +from pywikibot.tools import deprecated_args, normalize_username from pywikibot.exceptions import NoUsername @@ -189,8 +189,7 @@ warn('The length of tuple should be 2 to 4 (%s given)' % len(entry), _PasswordFileWarning) continue - username = entry[-2] - username = username[0].upper() + username[1:] + username = normalize_username(entry[-2]) if len(entry) == 4: # for userinfo included code and family if entry[0] == self.site.code and \ entry[1] == self.site.family.name and \ diff --git a/pywikibot/site.py b/pywikibot/site.py index 2f1cd0d..4bc67d7 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -32,7 +32,7 @@ from pywikibot.tools import ( itergroup, UnicodeMixin, ComparableMixin, SelfCallDict, SelfCallString, deprecated, deprecate_arg, deprecated_args, remove_last_args, - redirect_func, manage_wrapping, MediaWikiVersion, + redirect_func, manage_wrapping, MediaWikiVersion, normalize_username, ) from pywikibot.throttle import Throttle from pywikibot.data import api @@ -536,16 +536,7 @@ % (self.__code, self.__family.name)) self.nocapitalize = self.code in self.family.nocapitalize - if not self.nocapitalize: - if user: - user = user[0].upper() + user[1:] - if sysop: - sysop = sysop[0].upper() + sysop[1:] - if user: - user = user.replace('_', ' ') - if sysop: - sysop = sysop.replace('_', ' ') - self._username = [user, sysop] + self._username = [normalize_username(user), normalize_username(sysop)] self.use_hard_category_redirects = ( self.code in self.family.use_hard_category_redirects) diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 3a38dd5..1c879f2 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -241,6 +241,14 @@ raise AttributeError('%s.raw not set' % self.__class__.__name__) +def normalize_username(username): + """Normalize the username.""" + if not username: + return None + username = re.sub('[_ ]+', ' ', username).strip() + return username[0].upper() + username[1:] + + class MediaWikiVersion(Version): """ -- To view, visit https://gerrit.wikimedia.org/r/190672 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4fd4cca7d65f07d83bf21659a8c10a52c54d7747 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.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: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 2 months

Errored: wikimedia/pywikibot-core#2012 (master - 9b26056)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2012 Status: Errored Duration: 1 hour, 17 minutes, and 0 seconds Commit: 9b26056 (master) Author: amir Message: Minor improvment to regex pattern of archivebot Change-Id: Iff437c0748e07139e44c0bd5276265c3f303e99d View the changeset: https://github.com/wikimedia/pywikibot-core/compare/146abd64d1f6...9b260563… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/51622265 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 2 months

[Gerrit] Minor improvment to regex pattern of archivebot - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Minor improvment to regex pattern of archivebot ...................................................................... Minor improvment to regex pattern of archivebot Change-Id: Iff437c0748e07139e44c0bd5276265c3f303e99d --- M scripts/archivebot.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archivebot.py b/scripts/archivebot.py index dc13f7d..6c9a9d3 100644 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -535,8 +535,9 @@ self.archives[a].update(comment) # Save the page itself - rx = re.compile(r"{{(?:%s)?\:?%s\n.*?\n}}" % (u'|'.join( - set(self.site.namespaces[self.tpl.namespace()])), + marker = '?' if self.tpl.namespace() == 10 else '' + rx = re.compile(r"\{\{(?:(?:%s):)%s%s\s*?\n.*?\n\}\}" % (u'|'.join( + set(self.site.namespaces[self.tpl.namespace()])), marker, re.escape(self.tpl.title(withNamespace=False))), re.DOTALL) if not rx.search(self.page.header): pywikibot.error("Couldn't find the template in the header") -- To view, visit https://gerrit.wikimedia.org/r/191865 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff437c0748e07139e44c0bd5276265c3f303e99d Gerrit-PatchSet: 5 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: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 2 months

Passed: wikimedia/pywikibot-core#2011 (master - 146abd6)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2011 Status: Passed Duration: 48 minutes and 16 seconds Commit: 146abd6 (master) Author: jenkins-bot Message: Merge "archivebot: allow the config template written with canonical namespace" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/c7fa3b62e0af...146abd64… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/51493328 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 2 months

[Gerrit] archivebot: allow the config template written with canonical... - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: archivebot: allow the config template written with canonical namespace ...................................................................... archivebot: allow the config template written with canonical namespace * both English and localized (canonical) namespace are supported * when rewriting the header, the bot will canonicalize the template name Change-Id: I0229ab67d7fcea7007054d249112a818b5ff4e9c --- M scripts/archivebot.py 1 file changed, 11 insertions(+), 5 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archivebot.py b/scripts/archivebot.py index e0e607e..2898e14 100644 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -397,10 +397,10 @@ 'counter': ['1', False], 'key': ['', False], } - self.tpl = tpl self.salt = salt self.force = force self.site = page.site + self.tpl = pywikibot.Page(self.site, tpl) self.timestripper = TimeStripper(site=self.site) self.page = DiscussionPage(page, self) self.load_config() @@ -427,7 +427,7 @@ def attr2text(self): return '{{%s\n%s\n}}' \ - % (self.tpl, + % (self.tpl.title(), '\n'.join(['|%s = %s' % (a, self.get_attr(a)) for a in self.saveables()])) @@ -438,9 +438,9 @@ return self.get_attr('key') == s.hexdigest() def load_config(self): - pywikibot.output(u'Looking for: {{%s}} in %s' % (self.tpl, self.page)) + pywikibot.output(u'Looking for: {{%s}} in %s' % (self.tpl.title(), self.page)) for tpl in self.page.templatesWithParams(): - if tpl[0] == pywikibot.Page(self.site, self.tpl, ns=10): + if tpl[0] == pywikibot.Page(self.site, self.tpl.title(), ns=10): for param in tpl[1]: item, value = param.split('=', 1) self.set_attr(item.strip(), value.strip()) @@ -535,7 +535,12 @@ self.archives[a].update(comment) # Save the page itself - rx = re.compile('{{' + self.tpl + '\n.*?\n}}', re.DOTALL) + rx = re.compile(r"{{(?:%s)?\:?%s\n.*?\n}}" % (u'|'.join( + set(self.site.namespaces[self.tpl.namespace()])), + re.escape(self.tpl.title(withNamespace=False))), re.DOTALL) + if not rx.search(self.page.header): + pywikibot.error("Couldn't find the template in the header") + return self.page.header = rx.sub(self.attr2text(), self.page.header) self.comment_params['count'] = self.archived_threads self.comment_params['archives'] \ @@ -627,6 +632,7 @@ for a in args: pagelist = [] + a = pywikibot.Page(site, a, ns=10).title() if not filename and not pagename: if namespace is not None: ns = [str(namespace)] -- To view, visit https://gerrit.wikimedia.org/r/136532 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0229ab67d7fcea7007054d249112a818b5ff4e9c Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Whym <whym(a)whym.org> 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: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Whym <whym(a)whym.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

9 years, 2 months

Fixed: wikimedia/pywikibot-core#2010 (master - c7fa3b6)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2010 Status: Fixed Duration: 50 minutes and 16 seconds Commit: c7fa3b6 (master) Author: jenkins-bot Message: Merge "[FEAT] Pluralize some messages" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/4a2359429d93...c7fa3b62… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/51480138 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

9 years, 2 months

[Gerrit] [FEAT] Pluralize some messages - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FEAT] Pluralize some messages ...................................................................... [FEAT] Pluralize some messages - unlink becomes the counter for removing links and redirect - the number of changed links is the lenght of new_targets - simplify targets string by join statement, use localized comma separator. targets will be an empty string if the new_targets list is empty. Bug: T89678 Change-Id: Iff8f577e430deffea19b6763de1f53cfa58fd39e --- M scripts/solve_disambiguation.py 1 file changed, 23 insertions(+), 19 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index fad491e..c740a58 100644 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -559,7 +559,7 @@ # TODO: break this function up into subroutines! include = False - unlink = False + unlink_counter = 0 new_targets = [] try: text = refPage.get() @@ -769,7 +769,7 @@ elif choice in ['u', 'U']: # unlink - we remove the section if there's any text = text[:m.start()] + link_text + text[m.end():] - unlink = True + unlink_counter += 1 continue else: if len(choice) > 0 and choice[0] == 'r': @@ -843,7 +843,8 @@ pywikibot.showDiff(original_text, text) pywikibot.output(u'') # save the page - self.setSummaryMessage(disambPage, new_targets, unlink, dn) + self.setSummaryMessage(disambPage, new_targets, unlink_counter, + dn) try: refPage.put_async(text, comment=self.comment) except pywikibot.LockedPage: @@ -927,17 +928,16 @@ self.alternatives += links return True - def setSummaryMessage(self, disambPage, new_targets=[], unlink=False, + def setSummaryMessage(self, disambPage, new_targets=[], unlink_counter=0, dn=False): # make list of new targets - targets = '' - for page_title in new_targets: - targets += u'[[%s]], ' % page_title - # remove last comma - targets = targets[:-2] + comma = self.mysite.mediawiki_message(u"comma-separator") + targets = comma.join(u'[[%s]]' % page_title + for page_title in new_targets) if not targets: - targets = i18n.twtranslate(self.mysite, 'solve_disambiguation-unknown-page') + targets = i18n.twtranslate(self.mysite, + 'solve_disambiguation-unknown-page') # first check whether user has customized the edit comment if (self.mysite.family.name in config.disambiguation_comment and @@ -957,27 +957,29 @@ fallback=True) % disambPage.title() elif disambPage.isRedirectPage(): # when working on redirects, there's another summary message - if unlink and not new_targets: + if unlink_counter and not new_targets: self.comment = i18n.twtranslate( self.mysite, 'solve_disambiguation-redirect-removed', - {'from': disambPage.title()} - ) + {'from': disambPage.title(), + 'count': unlink_counter}) elif dn and not new_targets: self.comment = i18n.twtranslate( self.mysite, 'solve_disambiguation-redirect-adding-dn-template', - {'from': disambPage.title()} - ) + {'from': disambPage.title()}) else: self.comment = i18n.twtranslate( self.mysite, 'solve_disambiguation-redirect-resolved', - {'from': disambPage.title(), 'to': targets}) + {'from': disambPage.title(), + 'to': targets, + 'count': len(new_targets)}) else: - if unlink and not new_targets: + if unlink_counter and not new_targets: self.comment = i18n.twtranslate( self.mysite, 'solve_disambiguation-links-removed', - {'from': disambPage.title()}) + {'from': disambPage.title(), + 'count': unlink_counter}) elif dn and not new_targets: self.comment = i18n.twtranslate( self.mysite, 'solve_disambiguation-adding-dn-template', @@ -985,7 +987,9 @@ else: self.comment = i18n.twtranslate( self.mysite, 'solve_disambiguation-links-resolved', - {'from': disambPage.title(), 'to': targets}) + {'from': disambPage.title(), + 'to': targets, + 'count': len(new_targets)}) def run(self): if self.main_only: -- To view, visit https://gerrit.wikimedia.org/r/191650 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iff8f577e430deffea19b6763de1f53cfa58fd39e Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

9 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2015