Pywikibot-commits May 2015

pywikibot-commits@lists.wikimedia.org

2 participants
223 discussions

Passed: wikimedia/pywikibot-core#2304 (master - be8aac5)
by Travis CI 31 May '15

31 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2304 Status: Passed Duration: 21 minutes and 32 seconds Commit: be8aac5 (master) Author: jenkins-bot Message: Merge "[FIX] Re-enable BlockEntry and MoveEntry methods" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/821fcdf71ca9...be8aac54… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/64764717 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] [FIX] Re-enable BlockEntry and MoveEntry methods - change (pywikibot/core)
by jenkins-bot (Code Review) 31 May '15

31 May '15

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] Re-enable BlockEntry and MoveEntry methods ...................................................................... [FIX] Re-enable BlockEntry and MoveEntry methods - added new methods for PatrolEntry and RightsEntry classes - Parts of BlockEntry and MoveEntry are broken since MW 1.19 as the log entry specific data was accessed using log type while with MW 1.19 it's always 'params' - new generic hidden method _params() because the data key may depend on the entry type. - use data['params'] for newer mw versions else data[_expectedType] - flags must not be splitted, it is a list of flag strings now - data['expiry'] may not exists for infinite blocks. Return None here - isAutoblockRemoval could never be called as method. I removed it. - deprecate new_ns and new_title methods, use the newer names. - use target_ns instead of new_ns() - use target_page instead of new_title(). It was renamed because the method returns a page object - target_title just returns the title string. Tests are added. bug: T100424 bug: T99516 Change-Id: I610540df99fd6f5a77f0cfc8702555c2a082307a --- M pywikibot/logentries.py A tests/logentry_tests.py 2 files changed, 247 insertions(+), 36 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index c4919cb..238f0b2 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Objects representing Mediawiki log entries.""" # -# (C) Pywikibot team, 2007-2013 +# (C) Pywikibot team, 2007-2015 # # Distributed under the terms of the MIT license. # @@ -10,8 +10,14 @@ __version__ = '$Id$' # -from pywikibot.exceptions import Error +import sys + import pywikibot +from pywikibot.exceptions import Error +from pywikibot.tools import deprecated + +if sys.version_info[0] > 2: + basestring = (str, ) _logger = "wiki" @@ -51,6 +57,22 @@ def __hash__(self): return self.logid() + @property + def _params(self): + """ + Additional data for some log entry types. + + @rtype: dict or None + """ + if 'params' in self.data: + return self.data['params'] + else: # try old mw style preceding mw 1.19 + try: + return self.data[self._expectedType] + except KeyError: + raise Error("action='%s': this log entry has no params details " + "for type %s." % (self.action(), self.type)) + def logid(self): return self.data['logid'] @@ -61,7 +83,12 @@ return self.data['ns'] def title(self): - """Page on which action was performed.""" + """ + Page on which action was performed. + + Note: title may be missing in data dict e.g. by oversight action to + hide the title. In that case a KeyError exception will raise + """ if not hasattr(self, '_title'): self._title = pywikibot.Page(self.site, self.data['title']) return self._title @@ -79,7 +106,8 @@ def timestamp(self): """Timestamp object corresponding to event timestamp.""" if not hasattr(self, '_timestamp'): - self._timestamp = pywikibot.Timestamp.fromISOformat(self.data['timestamp']) + self._timestamp = pywikibot.Timestamp.fromISOformat( + self.data['timestamp']) return self._timestamp def comment(self): @@ -118,27 +146,19 @@ else: return super(BlockEntry, self).title() - def isAutoblockRemoval(self): - return self.isAutoblockRemoval - - def _getBlockDetails(self): - try: - return self.data['block'] - except KeyError: - # No 'block' key means this is an unblocking log entry - if self.action() == 'unblock': - raise Error("action='unblock': this log entry has no block details such as flags, duration, or expiry!") - raise - def flags(self): """ Return a list of (str) flags associated with the block entry. It raises an Error if the entry is an unblocking log entry. + + @rtype: list of flag strings """ - if hasattr(self, '_flags'): - return self._flags - self._flags = self._getBlockDetails()['flags'].split(',') + if not hasattr(self, '_flags'): + self._flags = self._params['flags'] + # pre mw 1.19 returned a delimited string. + if self._flags and isinstance(self._flags, basestring): + self._flags = self._flags.split(',') return self._flags def duration(self): @@ -146,26 +166,27 @@ Return a datetime.timedelta representing the block duration. @return: datetime.timedelta, or None if block is indefinite. - @raises Error: the entry is an unblocking log entry. """ - if hasattr(self, '_duration'): - return self._duration - if self._getBlockDetails()['duration'] == 'indefinite': - self._duration = None - else: - # Doing the difference is easier than parsing the string - self._duration = self.expiry() - self.timestamp() + if not hasattr(self, '_duration'): + if self.expiry() is None: + self._duration = None + else: + # Doing the difference is easier than parsing the string + self._duration = self.expiry() - self.timestamp() return self._duration def expiry(self): """ Return a Timestamp representing the block expiry date. - @raises Error: the entry is an unblocking log entry. + @rtype: pywikibot.Timestamp or None """ - if hasattr(self, '_expiry'): - return self._expiry - self._expiry = pywikibot.Timestamp.fromISOformat(self._getBlockDetails()['expiry']) + if not hasattr(self, '_expiry'): + details = self._params.get('expiry') + if details: + self._expiry = pywikibot.Timestamp.fromISOformat(details) + else: + self._expiry = None # for infinite blocks return self._expiry @@ -181,6 +202,20 @@ """Rights log entry.""" _expectedType = 'rights' + + @property + def oldgroups(self): + """Return old rights groups.""" + if 'old' in self._params: # old mw style + return self._params['old'].split(',') if self._params['old'] else [] + return self._params['oldgroups'] + + @property + def newgroups(self): + """Return new rights groups.""" + if 'new' in self._params: # old mw style + return self._params['new'].split(',') if self._params['new'] else [] + return self._params['newgroups'] class DeleteEntry(LogEntry): @@ -203,14 +238,38 @@ _expectedType = 'move' + @deprecated('target_ns.id') def new_ns(self): - return self.data['move']['new_ns'] + """Return namespace id of target page.""" + return self.target_ns.id + @property + def target_ns(self): + """Return namespace object of target page.""" + # key has been changed in mw 1.19 + return self.site.namespaces[self._params['target_ns'] + if 'target_ns' in self._params + else self._params['new_ns']] + + @deprecated('target_page') def new_title(self): """Return page object of the new title.""" - if not hasattr(self, '_new_title'): - self._new_title = pywikibot.Page(self.site, self.data['move']['new_title']) - return self._new_title + return self.target_page + + @property + def target_title(self): + """Return the target title.""" + # key has been changed in mw 1.19 + return (self._params['target_title'] + if 'target_title' in self._params + else self._params['new_title']) + + @property + def target_page(self): + """Return target page object.""" + if not hasattr(self, '_target_page'): + self._target_page = pywikibot.Page(self.site, self.target_title) + return self._target_page def suppressedredirect(self): """ @@ -219,7 +278,7 @@ @rtype: bool """ # Introduced in MW r47901 - return 'suppressedredirect' in self.data['move'] + return 'suppressedredirect' in self._params class ImportEntry(LogEntry): @@ -235,6 +294,25 @@ _expectedType = 'patrol' + @property + def current_id(self): + """Return the current id.""" + # key has been changed in mw 1.19; try the new mw style first + return (self._params['curid'] + if 'curid' in self._params else self._params['cur']) + + @property + def previous_id(self): + # key has been changed in mw 1.19; try the new mw style first + """Return the previous id.""" + return (self._params['previd'] + if 'previd' in self._params else self._params['prev']) + + @property + def auto(self): + """Return auto patrolled.""" + return 'auto' in self._params and self._params['auto'] != 0 + class NewUsersEntry(LogEntry): diff --git a/tests/logentry_tests.py b/tests/logentry_tests.py new file mode 100644 index 0000000..772b652 --- /dev/null +++ b/tests/logentry_tests.py @@ -0,0 +1,133 @@ +# -*- coding: utf-8 -*- +"""Test logentries module.""" +# +# (C) Pywikibot team, 2015 +# +# Distributed under the terms of the MIT license. +# +from __future__ import unicode_literals + +__version__ = '$Id$' + +import datetime +import sys + +import pywikibot +from pywikibot.logentries import LogEntryFactory + +from tests.aspects import ( + unittest, MetaTestCaseClass, TestCase, DeprecationTestCase +) + +if sys.version_info[0] > 2: + unicode = str + + +def get_logentry(site, logtype): + """Global method to retriev a single log entry.""" + return next(iter(site.logevents(logtype=logtype, total=1))) + + +class TestLogentriesMeta(MetaTestCaseClass): + + """Test meta class for TestLogentries.""" + + def __new__(cls, name, bases, dct): + """Create the new class.""" + cls.site = pywikibot.Site('de', 'wikipedia') + + def test_method(logtype): + + def test_logevent(self): + """Test a single logtype entry.""" + logentry = get_logentry(cls.site, logtype) + self.assertEqual(logtype, logentry._expectedType) + self.assertIsInstance(logentry.action(), unicode) + self.assertIsInstance(logentry.comment(), unicode) + self.assertIsInstance(logentry.logid(), int) + self.assertIsInstance(logentry.ns(), int) + self.assertIsInstance(logentry.pageid(), int) + self.assertIsInstance(logentry.timestamp(), pywikibot.Timestamp) + if 'title' in logentry.data: # title may be missing + self.assertIsInstance(logentry.title(), pywikibot.Page) + self.assertEqual(logentry.type(), logtype) + self.assertIsInstance(logentry.user(), unicode) + self.assertGreaterEqual(logentry.logid(), 0) + self.assertGreaterEqual(logentry.ns(), -2) + self.assertGreaterEqual(logentry.pageid(), 0) + return test_logevent + + # create test methods for package messages processed by unittest + for logtype in LogEntryFactory._logtypes: + test_name = str('test_%sEntry' % logtype.title()) + dct[test_name] = test_method(logtype) + + return super(MetaTestCaseClass, cls).__new__(cls, name, bases, dct) + + +class TestLogentries(TestCase): + + """Test TestLogentries processed by unittest.""" + + __metaclass__ = TestLogentriesMeta + + +class TestLogentryParams(TestCase): + + """Test Logentry params.""" + + family = 'wikipedia' + code = 'de' + + def test_BlockEntry(self): + """Test BlockEntry methods.""" + logentry = get_logentry(self.site, 'block') + if logentry.action() == 'block': + self.assertIsInstance(logentry.flags(), list) + if logentry.expiry() is not None: + self.assertIsInstance(logentry.expiry(), pywikibot.Timestamp) + self.assertIsInstance(logentry.duration(), datetime.timedelta) + + def test_RightsEntry(self): + """Test MoveEntry methods.""" + logentry = get_logentry(self.site, 'rights') + self.assertIsInstance(logentry.oldgroups, list) + self.assertIsInstance(logentry.newgroups, list) + + def test_MoveEntry(self): + """Test MoveEntry methods.""" + logentry = get_logentry(self.site, 'move') + self.assertIsInstance(logentry.target_ns, pywikibot.site.Namespace) + self.assertEqual(logentry.target_page.namespace(), + logentry.target_ns.id) + self.assertIsInstance(logentry.target_title, unicode) + self.assertIsInstance(logentry.target_page, pywikibot.Page) + self.assertIsInstance(logentry.suppressedredirect(), bool) + + def test_PatrolEntry(self): + """Test MoveEntry methods.""" + logentry = get_logentry(self.site, 'patrol') + self.assertIsInstance(logentry.current_id, int) + self.assertIsInstance(logentry.previous_id, int) + self.assertIsInstance(logentry.auto, bool) + + +class TestDeprecatedMethods(DeprecationTestCase): + + """Test cases for deprecated logentry methods.""" + + family = 'wikipedia' + code = 'de' + + def test_MoveEntry(self): + """Test MoveEntry methods.""" + logentry = get_logentry(self.site, 'move') + self.assertIsInstance(logentry.new_ns(), int) + self.assertEqual(logentry.new_title(), logentry.target_page) + + +if __name__ == '__main__': + try: + unittest.main() + except SystemExit: + pass -- To view, visit https://gerrit.wikimedia.org/r/211802 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I610540df99fd6f5a77f0cfc8702555c2a082307a Gerrit-PatchSet: 10 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: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Passed: wikimedia/pywikibot-core#2303 (master - 821fcdf)
by Travis CI 31 May '15

31 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2303 Status: Passed Duration: 25 minutes and 54 seconds Commit: 821fcdf (master) Author: Antoine Musso Message: Doc: fix misc errors reported by Sphinx Also comment out Sphinx `_static` setting. Change-Id: Ie90d88734f15995d82b3a0b029409bbc0a189fd8 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/0592360e6b58...821fcdf7… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/64753137 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Doc: fix misc errors reported by Sphinx - change (pywikibot/core)
by jenkins-bot (Code Review) 31 May '15

31 May '15

jenkins-bot has submitted this change and it was merged. Change subject: Doc: fix misc errors reported by Sphinx ...................................................................... Doc: fix misc errors reported by Sphinx Also comment out Sphinx `_static` setting. Change-Id: Ie90d88734f15995d82b3a0b029409bbc0a189fd8 --- M docs/conf.py M pywikibot/config2.py M pywikibot/i18n.py M pywikibot/page.py 4 files changed, 19 insertions(+), 12 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index a7b4ec4..2e59f19 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -122,7 +122,7 @@ # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +# html_static_path = ['_static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 971b19d..559a9cf 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -16,14 +16,17 @@ Provides two functions to register family classes which can be used in the user-config: + - register_family_file - register_families_folder Other functions made available to user-config: + - user_home_path Sets module global base_dir and provides utility methods to build paths relative to base_dir: + - makepath - datafilepath - shortpath diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 69549f8..b80f9ac 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -519,15 +519,21 @@ value. Multiple plurals are allowed. As an examples, if we had several json dictionaries in test folder like: - en.json: - { + + en.json: + + { "test-plural": "Bot: Changing %(num)s {{PLURAL:%(num)d|page|pages}}.", - } - fr.json - { + } + + fr.json: + + { "test-plural": "Robot: Changer %(descr)s {{PLURAL:num|une page|quelques pages}}.", - } - and so on. + } + + and so on. + >>> from pywikibot import i18n >>> i18n.set_messages_package('tests.i18n') >>> # use a number diff --git a/pywikibot/page.py b/pywikibot/page.py index 86290c7..c6b3f9b 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1943,7 +1943,6 @@ @return: a generator that yields a tuple for each use of a template in the page, with the template Page as the first entry and a list of parameters as the second entry. - """ # WARNING: may not return all templates used in particularly # intricate cases such as template substitution @@ -2436,12 +2435,11 @@ @param cat: New category title (without namespace) or Category object @type cat: unicode or Category @param message: message to use for category creation message - If two %s are provided in message, will be replaced - by (self.title, authorsList) + If two %s are provided in message, will be replaced + by (self.title, authorsList) @type message: unicode @return: True if copying was successful, False if target page already existed. - """ # This seems far too specialized to be in the top-level framework # move to category.py? (Although it doesn't seem to be used there, -- To view, visit https://gerrit.wikimedia.org/r/214842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie90d88734f15995d82b3a0b029409bbc0a189fd8 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Hashar <hashar(a)free.fr> 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: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Passed: wikimedia/pywikibot-core#2302 (master - 0592360)
by Travis CI 30 May '15

30 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2302 Status: Passed Duration: 21 minutes and 44 seconds Commit: 0592360 (master) Author: Ricordisamoa Message: replace.py: fix handling of addedCat, again In ReplaceRobot, with addedCat set, get categories from the new wikitext, otherwise old categories might be added back. Change-Id: Ie7c19d0517882e465183cc7982af7f3c5f733bf6 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/ae0847852efb...0592360e… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/64699217 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] replace.py: fix handling of addedCat, again - change (pywikibot/core)
by jenkins-bot (Code Review) 30 May '15

30 May '15

jenkins-bot has submitted this change and it was merged. Change subject: replace.py: fix handling of addedCat, again ...................................................................... replace.py: fix handling of addedCat, again In ReplaceRobot, with addedCat set, get categories from the new wikitext, otherwise old categories might be added back. Change-Id: Ie7c19d0517882e465183cc7982af7f3c5f733bf6 --- M scripts/replace.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index 2aa2d34..73c73aa 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -602,7 +602,7 @@ if hasattr(self, 'addedCat'): # Fetch only categories in wikitext, otherwise the others will # be explicitly added. - cats = textlib.getCategoryLinks(original_text) + cats = textlib.getCategoryLinks(new_text) if self.addedCat not in cats: cats.append(self.addedCat) new_text = textlib.replaceCategoryLinks(new_text, -- To view, visit https://gerrit.wikimedia.org/r/214805 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie7c19d0517882e465183cc7982af7f3c5f733bf6 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ricordisamoa <ricordisamoa(a)openmailbox.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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Passed: wikimedia/pywikibot-core#2301 (master - ae08478)
by Travis CI 30 May '15

30 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2301 Status: Passed Duration: 23 minutes and 3 seconds Commit: ae08478 (master) Author: jenkins-bot Message: Merge "Allow botirc module to load without irc dep" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/efc010586793...ae084785… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/64691212 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Allow botirc module to load without irc dep - change (pywikibot/core)
by jenkins-bot (Code Review) 30 May '15

30 May '15

jenkins-bot has submitted this change and it was merged. Change subject: Allow botirc module to load without irc dep ...................................................................... Allow botirc module to load without irc dep This allows sphinx to load the module without installing pre-req package 'irc'. Change-Id: I8235ca9008da07daeb65e1dae7424c2a8068a21e --- M pywikibot/botirc.py 1 file changed, 12 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/botirc.py b/pywikibot/botirc.py index c63f4d0..2464d8a 100644 --- a/pywikibot/botirc.py +++ b/pywikibot/botirc.py @@ -7,7 +7,7 @@ """ # # (C) Balasyum, 2008 -# (C) Pywikibot team, 2008-2014 +# (C) Pywikibot team, 2008-2015 # # Distributed under the terms of the MIT license. # @@ -22,7 +22,17 @@ import re -from ircbot import SingleServerIRCBot +try: + from ircbot import SingleServerIRCBot +except ImportError as e: + class SingleServerIRCBot(object): + + """Fake SingleServerIRCBot.""" + + def __init__(*args, **kwargs): + """Report import exception.""" + raise e + _logger = "botirc" -- To view, visit https://gerrit.wikimedia.org/r/214017 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8235ca9008da07daeb65e1dae7424c2a8068a21e Gerrit-PatchSet: 2 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: 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 <>

1 0

Fixed: wikimedia/pywikibot-core#2300 (master - efc0105)
by Travis CI 29 May '15

29 May '15

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #2300 Status: Fixed Duration: 31 minutes and 27 seconds Commit: efc0105 (master) Author: jenkins-bot Message: Merge "replace.py: fix handling of addedCat" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/ab557fcdbd37...efc01058… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/64631025 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] replace.py: fix handling of addedCat - change (pywikibot/core)
by jenkins-bot (Code Review) 29 May '15

29 May '15

jenkins-bot has submitted this change and it was merged. Change subject: replace.py: fix handling of addedCat ...................................................................... replace.py: fix handling of addedCat In ReplaceRobot, with addedCat set, get categories from wikitext instead of API, otherwise all categories will be then added. Change-Id: Ie68e148d50ac057f8919277606e05c99ffacc609 --- M scripts/replace.py 1 file changed, 11 insertions(+), 5 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/replace.py b/scripts/replace.py index b815609..2aa2d34 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -425,6 +425,7 @@ replaced. * addedCat - If set to a value, add this category to every page touched. + It can be a string or a Category object. Structure of the exceptions dictionary: This dictionary can have these keys: @@ -462,10 +463,13 @@ self.recursive = recursive if site: self.site = site + if addedCat: - cat_ns = site.category_namespaces()[0] - self.addedCat = pywikibot.Page(self.site, - cat_ns + ':' + addedCat) + if isinstance(addedCat, pywikibot.Category): + self.addedCat = addedCat + else: + self.addedCat = pywikibot.Category(self.site, addedCat) + self.sleep = sleep self.summary = summary self.changed_pages = 0 @@ -595,8 +599,10 @@ pywikibot.output(u'No changes were necessary in %s' % page.title(asLink=True)) break - if hasattr(self, "addedCat"): - cats = page.categories(nofollow_redirects=True) + if hasattr(self, 'addedCat'): + # Fetch only categories in wikitext, otherwise the others will + # be explicitly added. + cats = textlib.getCategoryLinks(original_text) if self.addedCat not in cats: cats.append(self.addedCat) new_text = textlib.replaceCategoryLinks(new_text, -- To view, visit https://gerrit.wikimedia.org/r/214647 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie68e148d50ac057f8919277606e05c99ffacc609 Gerrit-PatchSet: 1 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: Merlijn van Deen <valhallasw(a)arctus.nl> 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 May 2015