Pywikibot-commits April 2017

pywikibot-commits@lists.wikimedia.org

2 participants
100 discussions

[Gerrit] pywikibot/core[master]: Set Coordinate globe via item

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/334912 ) Change subject: Set Coordinate globe via item ...................................................................... Set Coordinate globe via item Allow globe to be set via a PageItem (in addition to its entity uri). Also renames this parameter to clarify its use. Also add get_globe_item() for retrieving the ItemPage corresponding to the globe, independently of how the globe was set. Change-Id: Idbf79a42720aca30be9a61aaf3b497f53ed87490 --- M pywikibot/__init__.py M tests/wikibase_edit_tests.py M tests/wikibase_tests.py 3 files changed, 141 insertions(+), 16 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 273e538..bc23405 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -235,8 +235,9 @@ _items = ('lat', 'lon', 'globe') + @deprecate_arg('entity', 'globe_item') def __init__(self, lat, lon, alt=None, precision=None, globe='earth', - typ="", name="", dim=None, site=None, entity=''): + typ='', name='', dim=None, site=None, globe_item=None): """ Represent a geo coordinate. @@ -257,8 +258,9 @@ @type dim: int @param site: The Wikibase site @type site: pywikibot.site.DataSite - @param entity: The URL entity of a Wikibase item for the globe - @type entity: str + @param globe_item: The Wikibase item for the globe, or the entity URI + of this Wikibase item. + @type globe_item: pywikibot.ItemPage or str """ self.lat = lat self.lon = lon @@ -267,20 +269,22 @@ if globe: globe = globe.lower() self.globe = globe - self._entity = entity + self._entity = globe_item self.type = typ self.name = name self._dim = dim - if not site: - self.site = Site().data_repository() - else: - self.site = site + self.site = site or Site().data_repository() @property def entity(self): - if self._entity: - return self._entity - return self.site.globes()[self.globe] + """Return the entity uri of the globe.""" + if not self._entity: + return self.site.globes()[self.globe] + + if isinstance(self._entity, ItemPage): + return self._entity.concept_uri() + + return self._entity def toWikibase(self): """ @@ -326,7 +330,7 @@ return cls(data['latitude'], data['longitude'], data['altitude'], data['precision'], - globe, site=site, entity=data['globe']) + globe, site=site, globe_item=data['globe']) @property def precision(self): @@ -396,6 +400,29 @@ ) return self._dim + def get_globe_item(self, repo=None, lazy_load=False): + """ + Return the ItemPage corresponding to the globe. + + Note that the globe need not be in the same data repository as the + Coordinate itself. + + A successful lookup is stored as an internal value to avoid the need + for repeated lookups. + + @param repo: the Wikibase site for the globe, if different from that + provided with the Coordinate. + @type repo: pywikibot.site.DataSite + @param lazy_load: Do not raise NoPage if ItemPage does not exist. + @type lazy_load: bool + @return: pywikibot.ItemPage + """ + if isinstance(self._entity, ItemPage): + return self._entity + + repo = repo or self.site + return ItemPage.from_entity_uri(repo, self.entity, lazy_load) + class WbTime(_WbRepresentation): diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py index 670eab9..6a54d5a 100644 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -239,6 +239,30 @@ claim = item.claims['P271'][0] self.assertEqual(claim.getTarget(), target) + def test_Coordinate_edit(self): + """Attempt adding a Coordinate with globe set via item.""" + testsite = self.get_repo() + item = self._clean_item(testsite, 'P20480') + + # Make sure the wiki supports wikibase-conceptbaseuri + version = testsite.version() + if MediaWikiVersion(version) < MediaWikiVersion('1.29.0-wmf.2'): + raise unittest.SkipTest('Wiki version must be 1.29.0-wmf.2 or ' + 'newer to support unbound uncertainties.') + + # set new claim + claim = pywikibot.page.Claim(testsite, 'P20480', + datatype='globe-coordinate') + target = pywikibot.Coordinate(site=testsite, lat=12.0, lon=13.0, + globe_item=item) + claim.setTarget(target) + item.addClaim(claim) + + # confirm new claim + item.get(force=True) + claim = item.claims['P20480'][0] + self.assertEqual(claim.getTarget(), target) + def test_WbQuantity_edit_unbound(self): """Attempt adding a quantity with unbound errors.""" # Clean the slate in preparation for test. @@ -246,7 +270,8 @@ item = self._clean_item(testsite, 'P69') # Make sure the wiki supports unbound uncertainties - if MediaWikiVersion(testsite.version()) < MediaWikiVersion('1.29.0-wmf.2'): + version = testsite.version() + if MediaWikiVersion(version) < MediaWikiVersion('1.29.0-wmf.2'): raise unittest.SkipTest('Wiki version must be 1.29.0-wmf.2 or ' 'newer to support unbound uncertainties.') diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 79a70d8..c80afff 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -158,18 +158,91 @@ with self.assertRaises(ValueError): z.precisionToDim() - def test_Coordinate_entity_globe(self): - """Test setting Coordinate globe from entity.""" + def test_Coordinate_plain_globe(self): + """Test setting Coordinate globe from a plain-text value.""" repo = self.get_repo() coord = pywikibot.Coordinate( site=repo, lat=12.0, lon=13.0, precision=0, - entity='http://www.wikidata.org/entity/Q123') + globe='moon') + self.assertEqual(coord.toWikibase(), + {'latitude': 12.0, 'longitude': 13.0, + 'altitude': None, 'precision': 0, + 'globe': 'http://www.wikidata.org/entity/Q405'}) + + def test_Coordinate_entity_uri_globe(self): + """Test setting Coordinate globe from an entity uri.""" + repo = self.get_repo() + coord = pywikibot.Coordinate( + site=repo, lat=12.0, lon=13.0, precision=0, + globe_item='http://www.wikidata.org/entity/Q123') self.assertEqual(coord.toWikibase(), {'latitude': 12.0, 'longitude': 13.0, 'altitude': None, 'precision': 0, 'globe': 'http://www.wikidata.org/entity/Q123'}) +class TestWikibaseCoordinateNonDry(WikidataTestCase): + + """ + Test Wikibase Coordinate data type (non-dry). + + These can be moved to TestWikibaseCoordinate once DrySite has been bumped + to the appropriate version. + """ + + def test_Coordinate_item_globe(self): + """Test setting Coordinate globe from an ItemPage.""" + repo = self.get_repo() + coord = pywikibot.Coordinate( + site=repo, lat=12.0, lon=13.0, precision=0, + globe_item=ItemPage(repo, 'Q123')) + self.assertEqual(coord.toWikibase(), + {'latitude': 12.0, 'longitude': 13.0, + 'altitude': None, 'precision': 0, + 'globe': 'http://www.wikidata.org/entity/Q123'}) + + def test_Coordinate_get_globe_item_from_uri(self): + """Test getting globe item from Coordinate with entity uri globe.""" + repo = self.get_repo() + q = pywikibot.Coordinate( + site=repo, lat=12.0, lon=13.0, precision=0, + globe_item='http://www.wikidata.org/entity/Q123') + self.assertEqual(q.get_globe_item(), ItemPage(repo, 'Q123')) + + def test_Coordinate_get_globe_item_from_itempage(self): + """Test getting globe item from Coordinate with ItemPage globe.""" + repo = self.get_repo() + globe = ItemPage(repo, 'Q123') + q = pywikibot.Coordinate( + site=repo, lat=12.0, lon=13.0, precision=0, globe_item=globe) + self.assertEqual(q.get_globe_item(), ItemPage(repo, 'Q123')) + + def test_Coordinate_get_globe_item_from_plain_globe(self): + """Test getting globe item from Coordinate with plain text globe.""" + repo = self.get_repo() + q = pywikibot.Coordinate( + site=repo, lat=12.0, lon=13.0, precision=0, globe='moon') + self.assertEqual(q.get_globe_item(), ItemPage(repo, 'Q405')) + + def test_Coordinate_get_globe_item_provide_repo(self): + """Test getting globe item from Coordinate, providing repo.""" + repo = self.get_repo() + q = pywikibot.Coordinate( + site=repo, lat=12.0, lon=13.0, precision=0, + globe_item='http://www.wikidata.org/entity/Q123') + self.assertEqual(q.get_globe_item(repo), ItemPage(repo, 'Q123')) + + def test_Coordinate_get_globe_item_different_repo(self): + """Test getting globe item in different repo from Coordinate.""" + repo = self.get_repo() + test_repo = pywikibot.Site('test', 'wikidata') + q = pywikibot.Coordinate( + site=repo, lat=12.0, lon=13.0, precision=0, + globe_item='http://test.wikidata.org/entity/Q123') + self.assertEqual(q.get_globe_item(test_repo), + ItemPage(test_repo, 'Q123')) + + class TestWbTime(WikidataTestCase): """Test Wikibase WbTime data type.""" -- To view, visit https://gerrit.wikimedia.org/r/334912 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idbf79a42720aca30be9a61aaf3b497f53ed87490 Gerrit-PatchSet: 7 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years

[Gerrit] pywikibot/core[master]: [IMPR] use extract_templates_and_params_regex_simple for tem...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346159 ) Change subject: [IMPR] use extract_templates_and_params_regex_simple for template validation ...................................................................... [IMPR] use extract_templates_and_params_regex_simple for template validation - the given regex can be replaced by the textlib library method textlib.extract_templates_and_params_regex_simple() Change-Id: I58d93e5cb2f7ee0823880b53fb98db9344c1c217 --- M tests/l10n_tests.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py index 3a09e98..ed1dd19 100644 --- a/tests/l10n_tests.py +++ b/tests/l10n_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Test valid templates.""" # -# (C) Pywikibot team, 2015 +# (C) Pywikibot team, 2015-2017 # # Distributed under the terms of the MIT license. # @@ -9,10 +9,9 @@ __version__ = '$Id$' -import re - import pywikibot from pywikibot import i18n +from pywikibot.textlib import extract_templates_and_params_regex_simple from tests.aspects import unittest, MetaTestCaseClass, TestCase from tests.utils import add_metaclass @@ -39,8 +38,9 @@ msg = i18n.twtranslate(lang, package, fallback=False) if msg: # check whether the message contains a template - template = re.findall(u'.*?{{(.*?)[|}]', msg) - self.assertTrue(template) + templates = extract_templates_and_params_regex_simple(msg) + self.assertIsInstance(templates, list) + self.assertGreater(len(templates), 0) # known problem if site.code == 'simple': @@ -49,7 +49,7 @@ "missing template. Must be solved by the " "corresponding script.") # check whether template exists - title = template[0] + title = templates[0][0] page = pywikibot.Page(site, title, ns=10) self.assertTrue(page.exists()) -- To view, visit https://gerrit.wikimedia.org/r/346159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58d93e5cb2f7ee0823880b53fb98db9344c1c217 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years

[Gerrit] pywikibot/core[master]: redirect_bot_tests: Use assert_called_with instead of assert...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346768 ) Change subject: redirect_bot_tests: Use assert_called_with instead of assert_called_once_with ...................................................................... redirect_bot_tests: Use assert_called_with instead of assert_called_once_with There is a warning during the initialization of the RedirectRobot on wsbeta which causes failure. Ignore it. Bug: T162356 Change-Id: I4c8c4ee1a32a4538171637baf840437de52a45f9 --- M tests/redirect_bot_tests.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/redirect_bot_tests.py b/tests/redirect_bot_tests.py index 3ae8e9d..358ae7d 100644 --- a/tests/redirect_bot_tests.py +++ b/tests/redirect_bot_tests.py @@ -48,7 +48,7 @@ """Test with delete and no i18n template.""" with patch.object(pywikibot, 'warning') as w: bot = RedirectRobot('broken', None, delete=True) - w.assert_called_once_with('No speedy deletion template available.') + w.assert_called_with('No speedy deletion template available.') self.assertEqual(bot.sdtemplate, None) def test_with_delete_and_non_existing_sdtemplate(self): @@ -57,5 +57,5 @@ with patch.object(Page, 'exists', new=Mock(return_value=False)): with patch.object(pywikibot, 'warning') as w: bot = RedirectRobot('broken', None, **options) - w.assert_called_once_with('No speedy deletion template "n" available.') + w.assert_called_with('No speedy deletion template "n" available.') self.assertEqual(bot.sdtemplate, None) -- To view, visit https://gerrit.wikimedia.org/r/346768 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c8c4ee1a32a4538171637baf840437de52a45f9 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years

[Gerrit] pywikibot/core[master]: Replaced the word 'async' with 'asynchronous'

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/313793 ) Change subject: Replaced the word 'async' with 'asynchronous' ...................................................................... Replaced the word 'async' with 'asynchronous' 'async' is becoming proper keyword in Python 3.7. Hence, replaced it with another word 'asynchronous' wherever 'async' was used as a parameter. Bug: T106230 Change-Id: I5f55b56f55932fb34db87b48bd1340082bd4ac49 --- M pywikibot/bot.py M pywikibot/page.py M scripts/cosmetic_changes.py M scripts/interwiki.py M scripts/replace.py M tests/edit_tests.py 6 files changed, 41 insertions(+), 31 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/bot.py b/pywikibot/bot.py index f99972e..1235b4c 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -99,7 +99,9 @@ debug, error, exception, log, output, stdout, warning, ) from pywikibot.logging import critical -from pywikibot.tools import deprecated, deprecated_args, PY2, PYTHON_VERSION +from pywikibot.tools import ( + deprecated, deprecate_arg, deprecated_args, PY2, PYTHON_VERSION, +) from pywikibot.tools._logging import ( LoggingFormatter as _LoggingFormatter, RotatingFileHandler, @@ -1254,6 +1256,7 @@ return True + @deprecate_arg('async', 'asynchronous') # T106230 @deprecated_args(comment='summary') def userPut(self, page, oldtext, newtext, **kwargs): """ @@ -1268,7 +1271,7 @@ Keyword args used: - * 'async' - passed to page.save + * 'asynchronous' - passed to page.save * 'summary' - passed to page.save * 'show_diff' - show changes between oldtext and newtext (enabled) * 'ignore_save_related_errors' - report and ignore (disabled) @@ -1315,8 +1318,8 @@ if not self.user_confirm('Do you want to accept these changes?'): return - if 'async' not in kwargs and self.getOption('always'): - kwargs['async'] = True + if 'asynchronous' not in kwargs and self.getOption('always'): + kwargs['asynchronous'] = True ignore_save_related_errors = kwargs.pop('ignore_save_related_errors', False) diff --git a/pywikibot/page.py b/pywikibot/page.py index 1885aef..9554068 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1154,9 +1154,10 @@ # no restricting template found return True + @deprecate_arg('async', 'asynchronous') # T106230 @deprecated_args(comment='summary', sysop=None) def save(self, summary=None, watch=None, minor=True, botflag=None, - force=False, async=False, callback=None, + force=False, asynchronous=False, callback=None, apply_cosmetic_changes=None, quiet=False, **kwargs): """ Save the current contents of page's text to the wiki. @@ -1182,7 +1183,7 @@ True if user has bot status, False if not) @param force: if True, ignore botMayEdit() setting @type force: bool - @param async: if True, launch a separate thread to save + @param asynchronous: if True, launch a separate thread to save asynchronously @param callback: a callable object that will be called after the page put operation. This object must take two arguments: (1) a @@ -1195,8 +1196,8 @@ @type apply_cosmetic_changes: bool or None @param quiet: enable/disable successful save operation message; defaults to False. - In async mode, if True, it is up to the calling bot to manage the - ouput e.g. via callback. + In asynchronous mode, if True, it is up to the calling bot to + manage the ouput e.g. via callback. @type quiet: bool """ if not summary: @@ -1208,19 +1209,22 @@ if not force and not self.botMayEdit(): raise pywikibot.OtherPageSaveError( self, "Editing restricted by {{bots}} template") - if async: + if asynchronous: pywikibot.async_request(self._save, summary=summary, watch=watch, minor=minor, botflag=botflag, - async=async, callback=callback, + asynchronous=asynchronous, + callback=callback, cc=apply_cosmetic_changes, quiet=quiet, **kwargs) else: self._save(summary=summary, watch=watch, minor=minor, - botflag=botflag, async=async, callback=callback, - cc=apply_cosmetic_changes, quiet=quiet, **kwargs) + botflag=botflag, asynchronous=asynchronous, + callback=callback, cc=apply_cosmetic_changes, + quiet=quiet, **kwargs) def _save(self, summary=None, watch=None, minor=True, botflag=None, - async=False, callback=None, cc=None, quiet=False, **kwargs): + asynchronous=False, callback=None, cc=None, quiet=False, + **kwargs): """Helper function for save().""" err = None link = self.title(asLink=True) @@ -1240,7 +1244,7 @@ err = edit_err # edit_err will be deleted in the end of the scope pywikibot.log(u"Error saving page %s (%s)\n" % (link, err), exc_info=True) - if not callback and not async: + if not callback and not asynchronous: if isinstance(err, pywikibot.PageSaveRelatedError): raise err raise pywikibot.OtherPageSaveError(self, err) @@ -1283,9 +1287,10 @@ comment += i18n.twtranslate(self.site, 'cosmetic_changes-append') return comment + @deprecate_arg('async', 'asynchronous') # T106230 @deprecated_args(comment='summary') def put(self, newtext, summary=u'', watchArticle=None, minorEdit=True, - botflag=None, force=False, async=False, callback=None, **kwargs): + botflag=None, force=False, asynchronous=False, callback=None, **kwargs): """ Save the page with the contents of the first argument as the text. @@ -1299,8 +1304,8 @@ """ self.text = newtext self.save(summary=summary, watch=watchArticle, minor=minorEdit, - botflag=botflag, force=force, async=async, callback=callback, - **kwargs) + botflag=botflag, force=force, asynchronous=asynchronous, + callback=callback, **kwargs) @deprecated_args(comment='summary') def put_async(self, newtext, summary=u'', watchArticle=None, @@ -1315,8 +1320,8 @@ backwards-compatibility. """ self.put(newtext, summary=summary, watchArticle=watchArticle, - minorEdit=minorEdit, botflag=botflag, force=force, async=True, - callback=callback, **kwargs) + minorEdit=minorEdit, botflag=botflag, force=force, + asynchronous=True, callback=callback, **kwargs) def watch(self, unwatch=False): """ @@ -1354,7 +1359,7 @@ See save() method docs for all parameters. The following parameters will be overridden by this method: - - summary, watch, minor, force, async + - summary, watch, minor, force, asynchronous Parameter botflag is False by default. @@ -1365,9 +1370,9 @@ # ensure always get the page text and not to change it. del self.text self.save(summary='Pywikibot touch edit', watch='nochange', - minor=False, botflag=botflag, force=True, async=False, - callback=callback, apply_cosmetic_changes=False, - **kwargs) + minor=False, botflag=botflag, force=True, + asynchronous=False, callback=callback, + apply_cosmetic_changes=False, **kwargs) else: raise pywikibot.NoPage(self) diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py index 1fc260f..9117d5a 100644 --- a/scripts/cosmetic_changes.py +++ b/scripts/cosmetic_changes.py @@ -77,7 +77,7 @@ if changedText is not False: self.put_current(new_text=changedText, summary=self.getOption('summary'), - async=self.getOption('async')) + asynchronous=self.getOption('async')) def main(*args): diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 0f45e60..7b4f5bc 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -504,7 +504,7 @@ minlinks = 0 quiet = False restoreAll = False - async = False + asynchronous = False summary = u'' repository = False @@ -613,7 +613,7 @@ elif arg == '-quiet': self.quiet = True elif arg == '-async': - self.async = True + self.asynchronous = True elif arg.startswith('-summary'): if len(arg) == 8: self.summary = pywikibot.input( @@ -1956,7 +1956,8 @@ page.text = newtext while True: try: - page.save(summary=mcomment, async=self.conf.async, + page.save(summary=mcomment, + asynchronous=self.conf.asynchronous, nocreate=True) except pywikibot.NoCreateError: pywikibot.exception() diff --git a/scripts/replace.py b/scripts/replace.py index 1abd206..f235c95 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -128,7 +128,7 @@ """ # # (C) Daniel Herding, 2004-2012 -# (C) Pywikibot team, 2004-2016 +# (C) Pywikibot team, 2004-2017 # # Distributed under the terms of the MIT license. # @@ -790,7 +790,8 @@ self.options['always'] = True if choice == 'y': page.text = new_text - page.save(summary=self.generate_summary(applied), async=True, + page.save(summary=self.generate_summary(applied), + asynchronous=True, callback=self._replace_async_callback, quiet=True) while not self._pending_processed_titles.empty(): proc_title, res = self._pending_processed_titles.get() diff --git a/tests/edit_tests.py b/tests/edit_tests.py index bd12c77..31f6c83 100644 --- a/tests/edit_tests.py +++ b/tests/edit_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for editing pages.""" # -# (C) Pywikibot team, 2015 +# (C) Pywikibot team, 2015-2017 # # Distributed under the terms of the MIT license. # @@ -55,7 +55,7 @@ ts = str(time.time()) p = pywikibot.Page(self.site, 'User:John Vandenberg/async test write') p.text = ts - p.save(async=True, callback=callback) + p.save(asynchronous=True, callback=callback) page_put_queue.join() -- To view, visit https://gerrit.wikimedia.org/r/313793 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5f55b56f55932fb34db87b48bd1340082bd4ac49 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Ayushjain19 <ayushjain081(a)gmail.com> Gerrit-Reviewer: AbdealiJK <abdealikothari(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zppix <Megadev44s.mail(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years

[Gerrit] pywikibot/core[master]: Add _items for WbMonolingualText

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346589 ) Change subject: Add _items for WbMonolingualText ...................................................................... Add _items for WbMonolingualText This enables a __str__ and __repr__ for this class. Also fixes whitespace issue (E305) at end of the class. Change-Id: Ibba69fb19aaaf799f658323e0b3012cc1be121c2 --- M pywikibot/__init__.py 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 273e538..eff852a 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -772,6 +772,8 @@ class WbMonolingualText(_WbRepresentation): """A Wikibase monolingual text representation.""" + _items = ('text', 'language') + def __init__(self, text, language): """ Create a new WbMonolingualText object. @@ -809,6 +811,7 @@ """ return cls(wb['text'], wb['language']) + _sites = {} _url_cache = {} # The code/fam pair for each URL -- To view, visit https://gerrit.wikimedia.org/r/346589 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibba69fb19aaaf799f658323e0b3012cc1be121c2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years

[Gerrit] pywikibot/core[master]: Allow date-versioned pypi releases from setup.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346342 ) Change subject: Allow date-versioned pypi releases from setup.py ...................................................................... Allow date-versioned pypi releases from setup.py This creates releases with versions like 3.0.20170403. Bug: T152907 Change-Id: Ie2b67b936479cbfc33e64a194e3038f367bc006c --- M setup.py M tox.ini 2 files changed, 15 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/setup.py b/setup.py index 560a408..d5167c7 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- -"""Installer script for Pywikibot 2.0 framework.""" +"""Installer script for Pywikibot 3.0 framework.""" # -# (C) Pywikibot team, 2009-2015 +# (C) Pywikibot team, 2009-2017 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, unicode_literals +from __future__ import absolute_import, print_function, unicode_literals import itertools import os @@ -190,7 +190,17 @@ from setuptools import setup, find_packages name = 'pywikibot' -version = '3.0-dev' +version = '3.0' + +try: + import subprocess + date = subprocess.check_output(['git', 'log', '-1', '--format=%ci']).strip() + date = date.split(" ")[0].replace("-", "") + version = version + "." + date +except Exception as e: + print(e) + version = version + "-dev" + github_url = 'https://github.com/wikimedia/pywikibot-core' setup( diff --git a/tox.ini b/tox.ini index 7e0a0af..513d5cc 100644 --- a/tox.ini +++ b/tox.ini @@ -147,6 +147,7 @@ putty-ignore = generate_family_file.py : +T001, T003 pwb.py : +T001, T003 + setup.py : +T003 pywikibot/date.py,pywikibot/family.py,pywikibot/fixes.py,pywikibot/textlib.py,pywikibot/userinterfaces/terminal_interface_unix.py,pywikibot/userinterfaces/terminal_interface_win32.py,pywikibot/families/wikipedia_family.py : +E241 pywikibot/textlib.py : +N801 pywikibot/userinterfaces/transliteration.py : +N801 -- To view, visit https://gerrit.wikimedia.org/r/346342 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie2b67b936479cbfc33e64a194e3038f367bc006c Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years

[Gerrit] pywikibot/core[master]: Add a few tests for RedirectRobot.get_sd_template

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346166 ) Change subject: Add a few tests for RedirectRobot.get_sd_template ...................................................................... Add a few tests for RedirectRobot.get_sd_template Change-Id: I79c8ef9129adc4bb623179429495c5bac0ecff78 --- A tests/redirect_bot_tests.py 1 file changed, 61 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/redirect_bot_tests.py b/tests/redirect_bot_tests.py new file mode 100644 index 0000000..3ae8e9d --- /dev/null +++ b/tests/redirect_bot_tests.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- +"""Tests for the redirect.py script.""" +# +# (C) Pywikibot team, 2017 +# +# Distributed under the terms of the MIT license. +# +from __future__ import absolute_import, unicode_literals + +__version__ = '$Id$' + +try: + from unittest.mock import Mock, patch +except ImportError: + from mock import Mock, patch + +import pywikibot + +from pywikibot import site, Page, i18n + +from scripts.redirect import RedirectRobot + +from tests.aspects import DefaultSiteTestCase + + +# To make `self.site.logged_in(sysop=True)` always return False +(a)patch.object(site.APISite, 'logged_in', new=Mock(return_value=False)) +(a)patch.object(Page, 'exists', new=Mock(return_value=True)) +class TestGetSDTemplateNoSysop(DefaultSiteTestCase): + + """Test the get_sd_template method of the RedirectRobot class.""" + + def test_with_delete_and_existing_sdtemplate(self): + """Test with delete and existing sdtemplate.""" + options = {'delete': True, 'sdtemplate': '{{t}}'} + bot = RedirectRobot('broken', None, **options) + self.assertEqual(bot.sdtemplate, '{{t}}') + + @patch.object(i18n, 'twhas_key', new=Mock(return_value=True)) + @patch.object(i18n, 'twtranslate', new=Mock(return_value='{{sd_title}}')) + def test_with_delete_and_i18n_sd(self): + """Test with delete and i18n template.""" + bot = RedirectRobot('broken', None, delete=True) + self.assertEqual(bot.sdtemplate, '{{sd_title}}') + + @patch.object(i18n, 'twhas_key', new=Mock(return_value=False)) + def test_with_delete_no_sd_no_i18n(self): + """Test with delete and no i18n template.""" + with patch.object(pywikibot, 'warning') as w: + bot = RedirectRobot('broken', None, delete=True) + w.assert_called_once_with('No speedy deletion template available.') + self.assertEqual(bot.sdtemplate, None) + + def test_with_delete_and_non_existing_sdtemplate(self): + """Test with delete and non-exisitng sdtemplate.""" + options = {'delete': True, 'sdtemplate': 'txt {{n|a}} txt'} + with patch.object(Page, 'exists', new=Mock(return_value=False)): + with patch.object(pywikibot, 'warning') as w: + bot = RedirectRobot('broken', None, **options) + w.assert_called_once_with('No speedy deletion template "n" available.') + self.assertEqual(bot.sdtemplate, None) -- To view, visit https://gerrit.wikimedia.org/r/346166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I79c8ef9129adc4bb623179429495c5bac0ecff78 Gerrit-PatchSet: 5 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years

[Gerrit] pywikibot/core[master]: [IMPR] Enable a new option sdtemplate for customized sd temp...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/344876 ) Change subject: [IMPR] Enable a new option sdtemplate for customized sd template ...................................................................... [IMPR] Enable a new option sdtemplate for customized sd template - templates from i18n might be missing or wrong. The new option may override the default setting. - as additional feature the template is checked when instantiating the bot Bug: T140624 Change-Id: Iaa336f88d4de3587e373d249f6f9417232264a13 --- M scripts/redirect.py 1 file changed, 42 insertions(+), 11 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/redirect.py b/scripts/redirect.py index f4bf614..6ff9da3 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -63,14 +63,18 @@ marked for deletion if the account has no admin rights) instead of just skipping them. +-sdtemplate:x Add the speedy deletion template string including brackets. + This enables overriding the default template via i18n or + to enable speedy deletion for projects other than wikipedias. + -always Don't prompt you for each replacement. """ # # (C) Daniel Herding, 2004 # (C) Purodha Blissenbach, 2009 -# (C) xqt, 2009-2016 -# (C) Pywikibot team, 2004-2016 +# (C) xqt, 2009-2017 +# (C) Pywikibot team, 2004-2017 # # Distributed under the terms of the MIT license. # @@ -86,6 +90,7 @@ from pywikibot import i18n, xmlreader, Bot from pywikibot.exceptions import ArgumentDeprecationWarning +from pywikibot.textlib import extract_templates_and_params_regex_simple from pywikibot.tools.formatter import color_format from pywikibot.tools import issue_deprecation_warning @@ -386,6 +391,7 @@ self.availableOptions.update({ 'number': None, 'delete': False, + 'sdtemplate': None, }) super(RedirectRobot, self).__init__(**kwargs) self.site = pywikibot.Site() @@ -394,6 +400,35 @@ self.action = action self.generator = generator self.exiting = False + self.sdtemplate = self.get_sd_template() + + def get_sd_template(self): + """Look for speedy deletion template and return it. + + @return: A valid speedy deletion template. + @rtype: str or None + """ + if self.getOption('delete') and not self.site.logged_in(sysop=True): + sd = self.getOption('sdtemplate') + if not sd and i18n.twhas_key(self.site, + 'redirect-broken-redirect-template'): + sd = i18n.twtranslate(self.site, + 'redirect-broken-redirect-template') + # TODO: Add bot's signature if needed (Bug: T131517) + + # check whether template exists for this site + title = None + if sd: + template = extract_templates_and_params_regex_simple(sd) + if template: + title = template[0][0] + page = pywikibot.Page(self.site, title, ns=10) + if page.exists(): + return sd + pywikibot.warning( + 'No speedy deletion template {0}available.' + ''.format('"{0}" '.format(title) if title else '')) + return None def delete_redirect(self, page, summary_key): """Delete the redirect page.""" @@ -402,8 +437,7 @@ reason = i18n.twtranslate(self.site, summary_key) if page.site.logged_in(sysop=True): page.delete(reason, prompt=False) - elif i18n.twhas_key(page.site, - 'redirect-broken-redirect-template'): + elif self.sdtemplate: pywikibot.output(u"No sysop in user-config.py, " u"put page to speedy deletion.") try: @@ -412,17 +446,11 @@ content_page = pywikibot.Page(page.site, page.title(withSection=False)) content = content_page.get(get_redirect=True) - # TODO: Add bot's signature if needed (Bug: T131517) - content = i18n.twtranslate( - page.site, - 'redirect-broken-redirect-template') + '\n' + content + content = self.sdtemplate + '\n' + content try: page.put(content, reason) except pywikibot.PageSaveRelatedError as e: pywikibot.error(e) - else: - pywikibot.output( - u'No speedy deletion template available') def delete_broken_redirects(self): """Process all broken redirects.""" @@ -748,6 +776,9 @@ options[option] = True elif option == 'total': options['number'] = number = int(value) + elif option == 'sdtemplate': + options['sdtemplate'] = value or pywikibot.input( + 'Which speedy deletion template to use?') # generator options elif option == 'fullscan': fullscan = True -- To view, visit https://gerrit.wikimedia.org/r/344876 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaa336f88d4de3587e373d249f6f9417232264a13 Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: MarcoAurelio <strigiwm(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years

[Gerrit] pywikibot/core[master]: page_tests.py: Use raw string notation for regular expressions

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346092 ) Change subject: page_tests.py: Use raw string notation for regular expressions ...................................................................... page_tests.py: Use raw string notation for regular expressions Python 3.6 issues "DeprecationWarning: invalid escape sequence" for using "\." in normal string literals. Change-Id: Ic5c3069e9cc04a17d44ead417219c75bdb61808c --- M tests/page_tests.py 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/page_tests.py b/tests/page_tests.py index 44b561a..3090f4d 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -37,9 +37,9 @@ ) -EMPTY_TITLE_RE = 'Title must be specified and not empty if source is a Site\.' -INVALID_TITLE_RE = 'The link does not contain a page title' -NO_PAGE_RE = 'doesn\'t exist\.' +EMPTY_TITLE_RE = r'Title must be specified and not empty if source is a Site\.' +INVALID_TITLE_RE = r'The link does not contain a page title' +NO_PAGE_RE = r"doesn't exist\." class TestLinkObject(SiteAttributeTestCase): @@ -856,7 +856,7 @@ text = u'This page is used in the [[mw:Manual:Pywikipediabot]] testing suite.' self.assertEqual(p1.get(), text) self.assertRaisesRegex(pywikibot.exceptions.IsRedirectPage, - '{0} is a redirect page\.' + r'{0} is a redirect page\.' .format(re.escape(str(p2))), p2.get) self.assertRaisesRegex(pywikibot.exceptions.NoPage, NO_PAGE_RE, p3.get) @@ -870,7 +870,7 @@ text = p2.get(get_redirect=True) self.assertRaisesRegex(pywikibot.exceptions.IsNotRedirectPage, - '{0} is not a redirect page\.' + r'{0} is not a redirect page\.' .format(re.escape(str(p1))), p1.set_redirect_target, p2) self.assertRaisesRegex(pywikibot.exceptions.NoPage, NO_PAGE_RE, -- To view, visit https://gerrit.wikimedia.org/r/346092 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic5c3069e9cc04a17d44ead417219c75bdb61808c Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years

[Gerrit] pywikibot/core[master]: Use i18n.translate in WikidataBot.getSource

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346050 ) Change subject: Use i18n.translate in WikidataBot.getSource ...................................................................... Use i18n.translate in WikidataBot.getSource Change-Id: Ib804608e7956d0bc2a50ecaae442a1fa2d68efb6 --- M pywikibot/bot.py 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 1e0135a..f99972e 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -83,6 +83,7 @@ from pywikibot import backports from pywikibot import config from pywikibot import daemonize +from pywikibot import i18n from pywikibot import version from pywikibot.bot_choice import ( Option, StandardOption, NestedOption, IntegerOption, ContextOption, @@ -1124,7 +1125,6 @@ def open_webbrowser(page): """Open the web browser displaying the page and wait for input.""" - from pywikibot import i18n webbrowser.open(page.full_url()) i18n.input('pywikibot-enter-finished-browser') @@ -1700,7 +1700,6 @@ def put_current(self, *args, **kwargs): """Defining a summary if not already defined and then call original.""" if not kwargs.get('summary'): - from pywikibot import i18n if self.summary_key is None: raise ValueError('The summary_key must be set.') summary = i18n.twtranslate(self.current_page.site, self.summary_key, @@ -1901,13 +1900,14 @@ @param site: site that is the source of assertions. @type site: Site - @return: Claim + @return: pywikibot.Claim or None """ - if (site.family.name in self.source_values and - site.code in self.source_values[site.family.name]): + source = None + item = i18n.translate(site, self.source_values) + if item: source = pywikibot.Claim(self.repo, 'P143') - source.setTarget(self.source_values.get(site.family.name).get(site.code)) - return source + source.setTarget(item) + return source def run(self): """Process all pages in generator.""" -- To view, visit https://gerrit.wikimedia.org/r/346050 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib804608e7956d0bc2a50ecaae442a1fa2d68efb6 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits April 2017