Pywikibot-commits November 2016

pywikibot-commits@lists.wikimedia.org

2 participants
61 discussions

[Gerrit] pywikibot/core[master]: Change of pagegenerator in test_pageid

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Change of pagegenerator in test_pageid ...................................................................... Change of pagegenerator in test_pageid On zh.wikisource (where test was failing) are no articles starting from A. Because this test checks generator for page_id's and it doesn't matter what generator was initially used, I'm changing it to -random. Bug: T151168 Change-Id: I4dba6d50c74136306434d7286d492f8a9a8deb9b --- M tests/pagegenerators_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 73b98a5..f0e123e 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -895,7 +895,7 @@ """Test pageid parameter.""" # Get reference pages and their pageids. gf = pagegenerators.GeneratorFactory(site=self.get_site()) - self.assertTrue(gf.handleArg('-prefixindex:a')) + self.assertTrue(gf.handleArg('-random')) gf.handleArg('-limit:10') gen = gf.getCombinedGenerator() pages = list(gen) -- To view, visit https://gerrit.wikimedia.org/r/322597 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4dba6d50c74136306434d7286d492f8a9a8deb9b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 5 months

[Gerrit] pywikibot/core[master]: [Breaking]Make uncertainties in WbQuantity optional

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [Breaking]Make uncertainties in WbQuantity optional ...................................................................... [Breaking]Make uncertainties in WbQuantity optional Per T115269/Idd62bdebaa066ba33c4005fa69501e0409adffbc uncertainties should not be added unless explicitly set, also uncertainties cannot be assumed to exist in the API responses. This patch is [Breaking] in that it: 1. It no longer sets +/- 0 as default (which comes down to the breaking change in WikiBase) 2. It requires the WbQuantity be initialised with a site object (which is due to needing to support older WikiBase versions) Bug: T150210 Change-Id: Ifbc3fc0f324c7483f0eba092529a05a8f617ec8c --- M pywikibot/__init__.py M pywikibot/page.py M tests/wikibase_edit_tests.py M tests/wikibase_tests.py 4 files changed, 121 insertions(+), 20 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 37f03bb..413b036 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -70,6 +70,7 @@ deprecated as __deprecated, deprecate_arg as __deprecate_arg, normalize_username, + MediaWikiVersion, redirect_func, ModuleDeprecationWrapper as _ModuleDeprecationWrapper, PY2, @@ -594,9 +595,29 @@ _items = ('amount', 'upperBound', 'lowerBound', 'unit') @staticmethod + def _require_errors(site): + """ + Check if the Wikibase site is so old it requires error bounds to be given. + + If no site item is supplied it raises a warning and returns True. + + @param site: The Wikibase site + @type site: pywikibot.site.DataSite + @rtype: bool + """ + if not site: + warning( + "WbQuantity now expects a 'site' parameter. This is needed to " + "ensure correct handling of error bounds.") + return True + return MediaWikiVersion(site.version()) < MediaWikiVersion('1.29.0-wmf.2') + + @staticmethod def _todecimal(value): """ Convert a string to a Decimal for use in WbQuantity. + + None value is returned as is. @param value: decimal number to convert @type value: str @@ -604,6 +625,8 @@ """ if isinstance(value, Decimal): return value + elif value is None: + return None return Decimal(str(value)) @staticmethod @@ -611,13 +634,17 @@ """ Convert a Decimal to a string representation suitable for WikiBase. + None value is returned as is. + @param value: decimal number to convert @type value: Decimal @rtype: str """ + if value is None: + return None return format(value, "+g") - def __init__(self, amount, unit=None, error=None): + def __init__(self, amount, unit=None, error=None, site=None): u""" Create a new WbQuantity object. @@ -628,6 +655,8 @@ @param error: the uncertainty of the amount (e.g. ±1) @type error: same as amount, or tuple of two values, where the first value is the upper error and the second is the lower error value. + @param site: The Wikibase site + @type site: pywikibot.site.DataSite """ if amount is None: raise ValueError('no amount given') @@ -637,16 +666,19 @@ self.amount = self._todecimal(amount) self.unit = unit - if error is None: - upperError = lowerError = Decimal(0) - elif isinstance(error, tuple): - upperError = self._todecimal(error[0]) - lowerError = self._todecimal(error[1]) + if error is None and not self._require_errors(site): + self.upperBound = self.lowerBound = None else: - upperError = lowerError = self._todecimal(error) + if error is None: + self.upperBound = self.lowerBound = Decimal(0) + elif isinstance(error, tuple): + upperError = self._todecimal(error[0]) + lowerError = self._todecimal(error[1]) + else: + upperError = lowerError = self._todecimal(error) - self.upperBound = self.amount + upperError - self.lowerBound = self.amount - lowerError + self.upperBound = self.amount + upperError + self.lowerBound = self.amount - lowerError def toWikibase(self): """ @@ -663,7 +695,7 @@ return json @classmethod - def fromWikibase(cls, wb): + def fromWikibase(cls, wb, site=None): """ Create a WbQuanity from the JSON data given by the Wikibase API. @@ -672,10 +704,12 @@ @rtype: pywikibot.WbQuanity """ amount = cls._todecimal(wb['amount']) - upperBound = cls._todecimal(wb['upperBound']) - lowerBound = cls._todecimal(wb['lowerBound']) - error = (upperBound - amount, amount - lowerBound) - return cls(amount, wb['unit'], error) + upperBound = cls._todecimal(wb.get('upperBound')) + lowerBound = cls._todecimal(wb.get('lowerBound')) + error = None + if (upperBound and lowerBound) or cls._require_errors(site): + error = (upperBound - amount, amount - lowerBound) + return cls(amount, wb['unit'], error, site) class WbMonolingualText(_WbRepresentation): diff --git a/pywikibot/page.py b/pywikibot/page.py index 165e7c8..30a1bb0 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4279,7 +4279,7 @@ FilePage(pywikibot.Site('commons', 'commons'), value), 'globe-coordinate': pywikibot.Coordinate.fromWikibase, 'time': lambda value, site: pywikibot.WbTime.fromWikibase(value), - 'quantity': lambda value, site: pywikibot.WbQuantity.fromWikibase(value), + 'quantity': pywikibot.WbQuantity.fromWikibase, 'monolingualtext': lambda value, site: pywikibot.WbMonolingualText.fromWikibase(value) } diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py index 59bcd29..a1e0f32 100644 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -18,6 +18,7 @@ import time import pywikibot +from pywikibot.tools import MediaWikiVersion from tests.aspects import unittest, WikibaseTestCase @@ -238,6 +239,28 @@ claim = item.claims['P271'][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. + testsite = self.get_repo() + item = self._clean_item(testsite, 'P69') + + # Make sure the wiki supports wikibase-conceptbaseuri + if MediaWikiVersion(testsite.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, 'P69', datatype='quantity') + target = pywikibot.WbQuantity(amount=1234) + claim.setTarget(target) + item.addClaim(claim) + + # confirm new claim + item.get(force=True) + claim = item.claims['P69'][0] + self.assertEqual(claim.getTarget(), target) + def test_identifier_edit(self): """Attempt adding a math claim with valid input.""" testsite = self.get_repo() diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index f428475..c746c36 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -20,6 +20,7 @@ from pywikibot import pagegenerators from pywikibot.page import WikibasePage, ItemPage from pywikibot.site import Namespace, NamespacesDict +from pywikibot.tools import MediaWikiVersion from tests import join_pages_path from tests.aspects import ( @@ -186,7 +187,7 @@ def test_WbQuantity_float_27(self): """Test WbQuantity for float value.""" - q = pywikibot.WbQuantity(amount=0.044405586) + q = pywikibot.WbQuantity(amount=0.044405586, error=0.0) q_dict = {'amount': '+0.044405586', 'lowerBound': '+0.044405586', 'upperBound': '+0.044405586', 'unit': '1', } self.assertEqual(q.toWikibase(), q_dict) @@ -200,21 +201,32 @@ def test_WbQuantity_decimal(self): """Test WbQuantity for decimal value.""" - q = pywikibot.WbQuantity(amount=Decimal('0.044405586')) + q = pywikibot.WbQuantity(amount=Decimal('0.044405586'), + error=Decimal('0.0')) q_dict = {'amount': '+0.044405586', 'lowerBound': '+0.044405586', 'upperBound': '+0.044405586', 'unit': '1', } self.assertEqual(q.toWikibase(), q_dict) def test_WbQuantity_string(self): """Test WbQuantity for decimal notation.""" - q = pywikibot.WbQuantity(amount='0.044405586') + q = pywikibot.WbQuantity(amount='0.044405586', error='0') q_dict = {'amount': '+0.044405586', 'lowerBound': '+0.044405586', 'upperBound': '+0.044405586', 'unit': '1', } self.assertEqual(q.toWikibase(), q_dict) + def test_WbQuantity_unbound(self): + """Test WbQuantity for integer value without bounds.""" + repo = self.get_repo() + if MediaWikiVersion(repo.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.') + q = pywikibot.WbQuantity(amount=1234.5, site=repo) + self.assertEqual(q.toWikibase(), + {'amount': '+1234.5', 'unit': '1', }) + def test_WbQuantity_formatting(self): """Test other WbQuantity methods.""" - q = pywikibot.WbQuantity(amount='0.044405586') + q = pywikibot.WbQuantity(amount='0.044405586', error='0') self.assertEqual("%s" % q, '{\n' ' "amount": "+%(val)s",\n' @@ -227,9 +239,28 @@ "upperBound=%(val)s, lowerBound=%(val)s, " "unit=1)" % {'val': '0.044405586'}) + def test_WbQuantity_formatting_unbound(self): + """Test WbQuantity formatting without bounds.""" + repo = self.get_repo() + if MediaWikiVersion(repo.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.') + q = pywikibot.WbQuantity(amount='0.044405586', site=repo) + self.assertEqual("%s" % q, + '{\n' + ' "amount": "+%(val)s",\n' + ' "lowerBound": null,\n' + ' "unit": "1",\n' + ' "upperBound": null\n' + '}' % {'val': '0.044405586'}) + self.assertEqual("%r" % q, + "WbQuantity(amount=%(val)s, " + "upperBound=None, lowerBound=None, " + "unit=1)" % {'val': '0.044405586'}) + def test_WbQuantity_equality(self): """Test WbQuantity equality.""" - q = pywikibot.WbQuantity(amount='0.044405586') + q = pywikibot.WbQuantity(amount='0.044405586', error='0') self.assertEqual(q, q) def test_WbQuantity_fromWikibase(self): @@ -243,6 +274,19 @@ {'amount': '+0.0229', 'lowerBound': '+0.0000', 'upperBound': '+1.0000', 'unit': '1', }) + def test_WbQuantity_fromWikibase_unbound(self): + """Test WbQuantity.fromWikibase() instantiating without bounds.""" + repo = self.get_repo() + if MediaWikiVersion(repo.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.') + q = pywikibot.WbQuantity.fromWikibase({u'amount': u'+0.0229', + u'unit': u'1'}, + site=repo) + self.assertEqual(q.toWikibase(), + {'amount': '+0.0229', 'lowerBound': None, + 'upperBound': None, 'unit': '1', }) + def test_WbQuantity_errors(self): """Test WbQuantity error handling.""" self.assertRaises(ValueError, pywikibot.WbQuantity, amount=None, -- To view, visit https://gerrit.wikimedia.org/r/320649 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifbc3fc0f324c7483f0eba092529a05a8f617ec8c Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <Ladsgroup(a)gmail.com> Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

7 years, 5 months

[Gerrit] pywikibot/core[master]: Rollback to old limit in deprecated generator

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Rollback to old limit in deprecated generator ...................................................................... Rollback to old limit in deprecated generator We decided to leave intrinsic limit in deprecated page generator. It will in fact made test_logevents_default passed. Bug: T151150 Change-Id: I70613731b697ad156ddad0ea9c5ef347df8454c0 --- M pywikibot/pagegenerators.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index a664119..f2f68de 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -906,7 +906,7 @@ # exclude -log, -nolog if log == 'log' and mode not in ['-', '-no'] and not tail: mode = mode[1:] - total = None + total = 500 if value: try: total = int(value) -- To view, visit https://gerrit.wikimedia.org/r/322501 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I70613731b697ad156ddad0ea9c5ef347df8454c0 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 5 months

[Gerrit] pywikibot/core[master]: Update claim about India location after Wikidata

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Update claim about India location after Wikidata ...................................................................... Update claim about India location after Wikidata Change on Wikidata: https://www.wikidata.org/w/index.php?title=Q668&type=revision&diff=35168057… Bug: T151147 Change-Id: Ie2e542ec0341a0087590cd37be2af69b86a6dbd3 --- M tests/pagegenerators_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index c2d963e..73b98a5 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -705,7 +705,7 @@ """Test ItemClaimFilterPageGenerator on sample page without qualifiers.""" self._simple_claim_test('P474', '+91', None, True) self._simple_claim_test('P463', 'Q37470', None, True) - self._simple_claim_test('P625', '21,78', None, True) + self._simple_claim_test('P625', '21,77', None, True) self._simple_claim_test('P625', '21,78.05,0.01', None, False) -- To view, visit https://gerrit.wikimedia.org/r/322497 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie2e542ec0341a0087590cd37be2af69b86a6dbd3 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 5 months

[Gerrit] pywikibot/core[master]: [doc] Add some documentation to PrefixingPageGenerator

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [doc] Add some documentation to PrefixingPageGenerator ...................................................................... [doc] Add some documentation to PrefixingPageGenerator Change-Id: If79dbef6a0877344ec22aa980c932eee9df9d27d --- M pywikibot/pagegenerators.py 1 file changed, 14 insertions(+), 2 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index e4bc8da..e0fb239 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -981,11 +981,23 @@ """ Prefixed Page generator. + @param prefix: The prefix of the pages. + @type prefix: str + @param namespace: Namespace to retrieve pages from + @type namespace: Namespace or int + @param includeredirects: If includeredirects is None, False or an empty + string, redirects will not be found. If includeredirects equals the + string 'only', only redirects will be found. Otherwise redirects will + be included. + @type includeredirects: None, bool, str + @param site: Site for generator results. + @type site: L{pywikibot.site.BaseSite} @param total: Maximum number of pages to retrieve in total @type total: int @param content: If True, load current version of each page (default False) - @param site: Site for generator results. - @type site: L{pywikibot.site.BaseSite} + @type content: bool + @return: a generator that yields Page objects + @rtype: generator """ if site is None: site = pywikibot.Site() -- To view, visit https://gerrit.wikimedia.org/r/279936 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If79dbef6a0877344ec22aa980c932eee9df9d27d Gerrit-PatchSet: 5 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: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 5 months

[Gerrit] pywikibot/core[master]: APIGenerator.set_maximum_items: Don't compare int with None

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: APIGenerator.set_maximum_items: Don't compare int with None ...................................................................... APIGenerator.set_maximum_items: Don't compare int with None `query_increment` can be None. In Python 2 None is less than any number but Python 3 raises "TypeError: unorderable types: int() < NoneType()". test_continue (tests.site_tests.TestDataSiteSearchEntities) was failing because of this issue. Change-Id: I73e711014303a397a1009c76798d2cfefabc608b --- M pywikibot/data/api.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index c087bb5..3b2ae9d 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -2435,7 +2435,7 @@ @type value: int """ self.limit = int(value) - if self.limit < self.query_increment: + if self.query_increment and self.limit < self.query_increment: self.request[self.limit_name] = self.limit pywikibot.debug(u"%s: Set request item limit to %i" % (self.__class__.__name__, self.limit), _logger) -- To view, visit https://gerrit.wikimedia.org/r/322232 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I73e711014303a397a1009c76798d2cfefabc608b Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master 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 <>

7 years, 5 months

[Gerrit] pywikibot/core[master]: wikibase_tests.py: Fix typo

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: wikibase_tests.py: Fix typo ...................................................................... wikibase_tests.py: Fix typo Change-Id: Ia6d69b8ee8ced4a127727d28dc4f1289542ae3e5 --- M tests/wikibase_tests.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 990d9ab..1e41852 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -646,7 +646,7 @@ wikidata = self.get_repo() item = ItemPage(wikidata, 'Q1') self.assertFalse(item.isRedirectPage()) - self.assertTrue(item.exits()) + self.assertTrue(item.exists()) self.assertRaises(pywikibot.IsNotRedirectPage, item.getRedirectTarget) def test_redirect_item(self): -- To view, visit https://gerrit.wikimedia.org/r/322225 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6d69b8ee8ced4a127727d28dc4f1289542ae3e5 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master 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 <>

7 years, 5 months

[Gerrit] pywikibot/core[master]: [bugfix] Solve pagegeneratrors_tests.TestFactoryGeneratorWik...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [bugfix] Solve pagegeneratrors_tests.TestFactoryGeneratorWikibase tests ...................................................................... [bugfix] Solve pagegeneratrors_tests.TestFactoryGeneratorWikibase tests - P357 was redirected to P1476. Use the new property ID to solve the KeyError - There was a hidden bug when comparing the WbMonolingualText because value is a basestring and does not have a __dict__ which is used by the WbRepresentation class. Add a new part for WBMonolingualText into Claim.target_equals() to solve it Bug: T150653 Change-Id: I4a2602d7d27f66615699af90b599a8a0ad623c50 --- M pywikibot/page.py M tests/pagegenerators_tests.py 2 files changed, 7 insertions(+), 2 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 165e7c8..9c59baf 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4631,6 +4631,7 @@ - ItemPage ID equality - WbTime year equality - Coordinate equality, regarding precision + - WbMonolingualText text equality - direct equality @param value: the value to compare with @@ -4662,6 +4663,10 @@ return (abs(self.target.lat - coord_args[0]) <= precision and abs(self.target.lon - coord_args[1]) <= precision) + if (isinstance(self.target, pywikibot.WbMonolingualText) and + isinstance(value, basestring)): + return self.target.text == value + return self.target == value def has_qualifier(self, qualifier_id, target): diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 06380ef..6b243ee 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -1007,7 +1007,7 @@ """Test -onlyif without qualifiers.""" gf = pagegenerators.GeneratorFactory(site=self.site) gf.handleArg('-page:Q15745378') - gf.handleArg('-onlyif:P357=International Journal of Minerals\, ' + gf.handleArg('-onlyif:P1476=International Journal of Minerals\, ' 'Metallurgy\, and Materials') gen = gf.getCombinedGenerator() self.assertIsNotNone(gen) @@ -1017,7 +1017,7 @@ """Test -onlyifnot without qualifiers.""" gf = pagegenerators.GeneratorFactory(site=self.site) gf.handleArg('-page:Q15745378') - gf.handleArg('-onlyifnot:P357=International Journal of Minerals\, ' + gf.handleArg('-onlyifnot:P1476=International Journal of Minerals\, ' 'Metallurgy\, and Materials') gen = gf.getCombinedGenerator() self.assertIsNotNone(gen) -- To view, visit https://gerrit.wikimedia.org/r/321364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a2602d7d27f66615699af90b599a8a0ad623c50 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: Ladsgroup <Ladsgroup(a)gmail.com> Gerrit-Reviewer: M4tx <m4tx(a)m4tx.pl> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 5 months

[Gerrit] pywikibot/core[master]: [bugfix] ItemPage.exists() should return True for redirects

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [bugfix] ItemPage.exists() should return True for redirects ...................................................................... [bugfix] ItemPage.exists() should return True for redirects - If a ItemPage is a redirect to another ItemPage then its exits() method should return True and not raise an IsRedirectPage exception - Test this behavior with and without get() operation because ItemPage.get() fills the _content instance variable Bug: T145971 Change-Id: I8d42372f69eda864811f00d781a56374923abad8 --- M pywikibot/page.py M tests/wikibase_tests.py 2 files changed, 13 insertions(+), 1 deletion(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 76cf4ae..c05e416 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -3454,7 +3454,7 @@ """ if not hasattr(self, '_content'): try: - self.get() + self.get(get_redirect=True) return True except pywikibot.NoPage: return False diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index d5dab0d..990d9ab 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -646,6 +646,7 @@ wikidata = self.get_repo() item = ItemPage(wikidata, 'Q1') self.assertFalse(item.isRedirectPage()) + self.assertTrue(item.exits()) self.assertRaises(pywikibot.IsNotRedirectPage, item.getRedirectTarget) def test_redirect_item(self): @@ -654,11 +655,22 @@ item = ItemPage(wikidata, 'Q10008448') item.get(get_redirect=True) target = ItemPage(wikidata, 'Q8422626') + # tests after get operation self.assertTrue(item.isRedirectPage()) + self.assertTrue(item.exists()) self.assertEqual(item.getRedirectTarget(), target) self.assertIsInstance(item.getRedirectTarget(), ItemPage) self.assertRaises(pywikibot.IsRedirectPage, item.get) + def test_redirect_item_without_get(self): + """Test redirect item without explicit get operation.""" + wikidata = self.get_repo() + item = pywikibot.ItemPage(wikidata, 'Q10008448') + self.assertTrue(item.exists()) + self.assertTrue(item.isRedirectPage()) + target = pywikibot.ItemPage(wikidata, 'Q8422626') + self.assertEqual(item.getRedirectTarget(), target) + class TestPropertyPage(WikidataTestCase): -- To view, visit https://gerrit.wikimedia.org/r/311337 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d42372f69eda864811f00d781a56374923abad8 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: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: jenkins-bot <>

7 years, 5 months

[Gerrit] pywikibot/core[master]: [bugfix] remove UntaggedPageGenerator

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [bugfix] remove UntaggedPageGenerator ...................................................................... [bugfix] remove UntaggedPageGenerator - https://toolserver.org/~daniel/WikiSense/UntaggedImages.php is no longer available and the project has been discontinued. Remove it. Change-Id: I68805b101856ffc272d0022193f9ec32f077da31 --- M pywikibot/pagegenerators.py 1 file changed, 1 insertion(+), 38 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 605ebd8..d4677e7 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -49,7 +49,6 @@ ) from pywikibot import date, config, i18n, xmlreader -from pywikibot.comms import http from pywikibot.exceptions import ArgumentDeprecationWarning, UnknownExtension from pywikibot.proofreadpage import ProofreadPage @@ -277,11 +276,6 @@ [[Special:RandomRedirect]]. Can also be given as "-randomredirect:n" where n is the number of pages to be returned. - --untagged Work on image pages that don't have any license template on a - site given in the format "<language>.<project>.org, e.g. - "ja.wikipedia.org" or "commons.wikimedia.org". - Using an external Toolserver tool. -google Work on all pages that are found in a Google search. You need a Google Web API license key. Note that Google @@ -879,7 +873,7 @@ elif arg == '-yahoo': gen = YahooSearchPageGenerator(value, site=self.site) elif arg == '-untagged': - gen = UntaggedPageGenerator(value, site=self.site) + issue_deprecation_warning(arg, None, 2) elif arg == '-wikidataquery': if not value: value = pywikibot.input('WikidataQuery string:') @@ -2291,37 +2285,6 @@ site = pywikibot.Site() for page in site.search(query, total=total, namespaces=namespaces): yield page - - -def UntaggedPageGenerator(untaggedProject, limit=500, site=None): - """ - Yield pages from defunct toolserver UntaggedImages.php. - - It was using this tool: - https://toolserver.org/~daniel/WikiSense/UntaggedImages.php - - @param site: Site for generator results. - @type site: L{pywikibot.site.BaseSite} - """ - URL = "https://toolserver.org/~daniel/WikiSense/UntaggedImages.php?" - REGEXP = r"<td valign='top' title='Name'><a href='http[s]?://.*?" \ - "\.org/w/index\.php\?title=(.*?)'>.*?</a></td>" - lang, project = untaggedProject.split('.', 1) - if lang == 'commons': - wiki = 'wikifam=commons.wikimedia.org' - else: - wiki = 'wikilang=%s&wikifam=.%s' % (lang, project) - link = '%s&%s&max=%d&order=img_timestamp' % (URL, wiki, limit) - results = re.findall(REGEXP, http.fetch(link)) - if not results: - raise pywikibot.Error( - u'Nothing found at %s! Try to use the tool by yourself to be sure ' - u'that it works!' % link) - if not site: - site = pywikibot.Site() - else: - for result in results: - yield pywikibot.Page(site, result) def LiveRCPageGenerator(site=None, total=None): -- To view, visit https://gerrit.wikimedia.org/r/321840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68805b101856ffc272d0022193f9ec32f077da31 Gerrit-PatchSet: 3 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: jenkins-bot <>

7 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits November 2016