Pywikibot-commits March 2017

pywikibot-commits@lists.wikimedia.org

2 participants
115 discussions

[Gerrit] pywikibot/core[master]: Add 'application/vnd.php.serialized' to expected content for...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342162 ) Change subject: Add 'application/vnd.php.serialized' to expected content formats of DataSite ...................................................................... Add 'application/vnd.php.serialized' to expected content formats of DataSite Bug: T129281 Change-Id: Ifef728e940451b60fb04cd4d3d4bae0501548c03 --- M tests/paraminfo_tests.py 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/tests/paraminfo_tests.py b/tests/paraminfo_tests.py index 86236ba..8a8d776 100644 --- a/tests/paraminfo_tests.py +++ b/tests/paraminfo_tests.py @@ -12,6 +12,7 @@ from pywikibot.family import WikimediaFamily from pywikibot.page import Claim, Property +from pywikibot.site import DataSite from pywikibot.tools import MediaWikiVersion from tests.aspects import ( @@ -123,6 +124,9 @@ ] if MediaWikiVersion(self.site.version()) >= MediaWikiVersion('1.24'): base.append('application/json') + if isinstance(self.site, DataSite): + # It is not clear when this format has been added, see T129281. + base.append('application/vnd.php.serialized') self._check_param_values(self.site, 'edit', 'contentformat', base) self._check_param_values(self.site, 'parse', 'contentformat', base) -- To view, visit https://gerrit.wikimedia.org/r/342162 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifef728e940451b60fb04cd4d3d4bae0501548c03 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: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 2 months

Errored: wikimedia/pywikibot-core#3897 (master - 6f33dee)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3897 Status: Errored Duration: 2 hours, 24 minutes, and 6 seconds Commit: 6f33dee (master) Author: jenkins-bot Message: Merge "Fix spelling mistake in pagegenerators.py" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/f91a37b80f80...6f33dee4… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/209347961 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 2 months

Errored: wikimedia/pywikibot-core#3896 (master - f91a37b)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3896 Status: Errored Duration: 2 hours, 19 minutes, and 18 seconds Commit: f91a37b (master) Author: xqt Message: Revert "Improve and re-enable translateMagicWords" This reverts commit 911d9359256bfbb0742e1159457d5a5633f76433. Bug: 159997 Change-Id: I6fbecbee2d3dd09ad3dcd8ae76bc4e0cbf857f9e View the changeset: https://github.com/wikimedia/pywikibot-core/compare/ac67d2b48908...f91a37b8… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/209338376 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 2 months

[Gerrit] pywikibot/core[master]: Fix spelling mistake in pagegenerators.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/341994 ) Change subject: Fix spelling mistake in pagegenerators.py ...................................................................... Fix spelling mistake in pagegenerators.py Change-Id: Iafa6d5e260dea206606c0ca62b92bc1c427f57be --- M pywikibot/pagegenerators.py 1 file changed, 20 insertions(+), 20 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 98ed579..b96d860 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -964,7 +964,7 @@ If includeredirects is False, redirects are not included. If includeredirects equals the string 'only', only redirects are added. - @param total: Maxmum number of pages to retrieve in total + @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. @@ -1382,7 +1382,7 @@ total=None, _filter_unique=filter_unique): """Yield unique pages edited by user:username. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param namespaces: list of namespace numbers to fetch contribs from @type namespaces: list of int @@ -1970,7 +1970,7 @@ """ New file generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2046,7 +2046,7 @@ """ Unused files generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2062,7 +2062,7 @@ """ Page lacking interwikis generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} """ @@ -2077,7 +2077,7 @@ """ Uncategorized category generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2093,7 +2093,7 @@ """ Uncategorized file generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2109,7 +2109,7 @@ """ Uncategorized page generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2125,7 +2125,7 @@ """ Uncategorized template generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2141,7 +2141,7 @@ """ Lonely page generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2157,7 +2157,7 @@ """ Unwatched page generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2172,7 +2172,7 @@ """ Wanted page generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2188,7 +2188,7 @@ """ Ancient page generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2204,7 +2204,7 @@ """ Dead-end page generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2220,7 +2220,7 @@ """ Long page generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2236,7 +2236,7 @@ """ Short page generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2252,7 +2252,7 @@ """ Random page generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2268,7 +2268,7 @@ """ Random redirect generator. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2291,7 +2291,7 @@ @type url: str @param namespaces: list of namespace numbers to fetch contribs from @type namespaces: list of int - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} @@ -2307,7 +2307,7 @@ """ Yield pages from the MediaWiki internal search engine. - @param total: Maxmum number of pages to retrieve in total + @param total: Maximum number of pages to retrieve in total @type total: int @param site: Site for generator results. @type site: L{pywikibot.site.BaseSite} -- To view, visit https://gerrit.wikimedia.org/r/341994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iafa6d5e260dea206606c0ca62b92bc1c427f57be Gerrit-PatchSet: 1 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: jenkins-bot <>

7 years, 2 months

[Gerrit] pywikibot/core[master]: Revert "Improve and re-enable translateMagicWords"

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/342000 ) Change subject: Revert "Improve and re-enable translateMagicWords" ...................................................................... Revert "Improve and re-enable translateMagicWords" This reverts commit 911d9359256bfbb0742e1159457d5a5633f76433. Bug: 159997 Change-Id: I6fbecbee2d3dd09ad3dcd8ae76bc4e0cbf857f9e --- M pywikibot/cosmetic_changes.py M tests/cosmetic_changes_tests.py 2 files changed, 8 insertions(+), 22 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index 07fb95c..f1923a8 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -50,7 +50,7 @@ """ # # (C) xqt, 2009-2016 -# (C) Pywikibot team, 2006-2017 +# (C) Pywikibot team, 2006-2016 # # Distributed under the terms of the MIT license. # @@ -221,7 +221,8 @@ self.cleanUpSectionHeaders, self.putSpacesInLists, self.translateAndCapitalizeNamespaces, - self.translateMagicWords, + # FIXME: fix bugs and re-enable + # self.translateMagicWords, self.replaceDeprecatedTemplates, # FIXME: fix bugs and re-enable # self.resolveHtmlEntities, @@ -405,22 +406,19 @@ """Use localized magic words.""" # not wanted at ru # arz uses english stylish codes - # no need to run on English wikis - if self.site.code not in ['arz', 'en', 'ru']: + if self.site.code not in ['arz', 'ru']: exceptions = ['nowiki', 'comment', 'math', 'pre'] for magicWord in ['img_thumbnail', 'img_left', 'img_center', 'img_right', 'img_none', 'img_framed', 'img_frameless', 'img_border', 'img_upright', ]: - aliases = list(self.site.getmagicwords(magicWord)) - preferred = aliases.pop(0) + aliases = self.site.getmagicwords(magicWord) if not aliases: continue text = textlib.replaceExcept( text, - r'\[\[(?P<left>.+?:.+?\..+?\|(.*?\|)*?) *(' + - '|'.join(aliases) + - r') *(?P<right>(\|.*?)*?\]\])', - r'[[\g<left>' + preferred + r'\g<right>', exceptions) + r'\[\[(?P<left>.+?:.+?\..+?\|) *(' + '|'.join(aliases) + + r') *(?P<right>(\|.*?)?\]\])', + r'[[\g<left>' + aliases[0] + r'\g<right>', exceptions) return text def cleanUpLinks(self, text): diff --git a/tests/cosmetic_changes_tests.py b/tests/cosmetic_changes_tests.py index 5db7281..cc3947c 100644 --- a/tests/cosmetic_changes_tests.py +++ b/tests/cosmetic_changes_tests.py @@ -244,18 +244,6 @@ self.assertEqual( '[[File:Foo.bar|miniatur]]', self.cct.translateMagicWords('[[File:Foo.bar|mini]]')) - self.assertEqual( - '[[File:Foo.bar|links|miniatur]]', - self.cct.translateMagicWords('[[File:Foo.bar|left|thumb]]')) - self.assertEqual( - '[[File:Foo.bar|250px|links]]', - self.cct.translateMagicWords('[[File:Foo.bar|250px|left]]')) - self.assertEqual( - '[[File:Foo.bar|links|250px]]', - self.cct.translateMagicWords('[[File:Foo.bar| left |250px]]')) - self.assertEqual( - '[[File:Foo.bar|250px|zentriert|Baz]]', - self.cct.translateMagicWords('[[File:Foo.bar|250px|center|Baz]]')) def test_cleanUpLinks_pipes(self): """Test cleanUpLinks method.""" -- To view, visit https://gerrit.wikimedia.org/r/342000 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6fbecbee2d3dd09ad3dcd8ae76bc4e0cbf857f9e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 2 months

Errored: wikimedia/pywikibot-core#3895 (master - ac67d2b)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3895 Status: Errored Duration: 2 hours, 27 minutes, and 8 seconds Commit: ac67d2b (master) Author: jenkins-bot Message: Merge "Update security requirements of requests" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/06b28ecc2573...ac67d2b4… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/209244604 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 2 months

Errored: wikimedia/pywikibot-core#3894 (master - 06b28ec)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3894 Status: Errored Duration: 54 minutes and 2 seconds Commit: 06b28ec (master) Author: jenkins-bot Message: Merge "Allow retrieval of unit as ItemPage for WbQuantity" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/3cff42e71434...06b28ecc… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/209243021 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 2 months

[Gerrit] pywikibot/core[master]: Update security requirements of requests

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/341969 ) Change subject: Update security requirements of requests ...................................................................... Update security requirements of requests Requests security now requires pyOpenSSL>=0.14, cryptography>=1.3.4 and idna>=2.0.0.[1] [1]: https://goo.gl/XMtWe3 Bug: T159808 Change-Id: Icafa8b3e55bd5bb924b1a341b4f822608a8423f3 --- M requests-requirements.txt M requirements.txt 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/requests-requirements.txt b/requests-requirements.txt index e5cf659..a2ffe1e 100644 --- a/requests-requirements.txt +++ b/requests-requirements.txt @@ -2,8 +2,8 @@ # requests security extra # Bug T105767 on Python 2.7 release 9+ -pyOpenSSL>=0.13 ; python_full_version < '2.7.9' or python_version >= '3' -ndg-httpsclient ; python_full_version < '2.7.9' or python_version >= '3' -pyasn1 ; python_full_version < '2.7.9' or python_version >= '3' +pyOpenSSL>=0.14 ; python_full_version < '2.7.9' or python_version >= '3' +cryptography>=1.3.4 ; python_full_version < '2.7.9' or python_version >= '3' +idna>=2.0.0 ; python_full_version < '2.7.9' or python_version >= '3' # https://github.com/eliben/pycparser/issues/147 pycparser != 2.14 diff --git a/requirements.txt b/requirements.txt index 5c5183f..6b82cb5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,9 +22,9 @@ requests>=2.4.1 # requests security extra -pyOpenSSL>=0.13 ; python_full_version < '2.7.9' -ndg-httpsclient ; python_full_version < '2.7.9' -pyasn1 ; python_full_version < '2.7.9' +pyOpenSSL>=0.14 ; python_full_version < '2.7.9' +cryptography>=1.3.4 ; python_full_version < '2.7.9' +idna>=2.0.0 ; python_full_version < '2.7.9' # https://github.com/eliben/pycparser/issues/147 pycparser != 2.14 -- To view, visit https://gerrit.wikimedia.org/r/341969 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icafa8b3e55bd5bb924b1a341b4f822608a8423f3 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: Magul <tomasz.magulski(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

7 years, 2 months

[Gerrit] pywikibot/core[master]: Allow retrieval of unit as ItemPage for WbQuantity

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339389 ) Change subject: Allow retrieval of unit as ItemPage for WbQuantity ...................................................................... Allow retrieval of unit as ItemPage for WbQuantity Introduces ItemPage.from_entity_uri() which attempts to retrieve the ItemPage corresponding to an entity uri (e.g. http://www.wikidata.org/entity/Q123) This function is accessed from WbQuantity.get_unit_item() to retrieve the ItemPage correspoding to the unit. In future it could also be used for e.g. Coordinate globes or to resolve sparql results. The site parameter was added to TestWbQuantity tests so as to obey rules for Dry tests. Bug: T143594 Change-Id: I9746881ada22cb7dd47a76c0597737f063cd31f6 --- M pywikibot/__init__.py M pywikibot/page.py M tests/wikibase_tests.py 3 files changed, 168 insertions(+), 22 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index b980330..5b87ea5 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -662,7 +662,7 @@ @param amount: number representing this quantity @type amount: string or Decimal. Other types are accepted, and converted via str to Decimal. - @param unit: the Wikibase item for the unit or the URL entity of this + @param unit: the Wikibase item for the unit or the entity URI of this Wikibase item. @type unit: pywikibot.ItemPage, str or None @param error: the uncertainty of the amount (e.g. ±1) @@ -676,11 +676,12 @@ self.amount = self._todecimal(amount) self._unit = unit + self.site = site or Site().data_repository() - # also allow entity urls to be provided via unit parameter + # also allow entity URIs to be provided via unit parameter if isinstance(unit, basestring) and \ unit.partition('://')[0] not in ('http', 'https'): - raise ValueError("'unit' must be an ItemPage or entity url.") + raise ValueError("'unit' must be an ItemPage or entity uri.") if error is None and not self._require_errors(site): self.upperBound = self.lowerBound = None @@ -698,11 +699,35 @@ @property def unit(self): - """Return _unit's entity url or '1' if _unit is None.""" + """Return _unit's entity uri or '1' if _unit is None.""" if isinstance(self._unit, ItemPage): - return self._unit.concept_url() + return self._unit.concept_uri() return self._unit or '1' + def get_unit_item(self, repo=None, lazy_load=False): + """ + Return the ItemPage corresponding to the unit. + + Note that the unit need not be in the same data repository as the + WbQuantity itself. + + A successful lookup is stored as an internal value to avoid the need + for repeated lookups. + + @param repo: the Wikibase site for the unit, if different from that + provided with the WbQuantity. + @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 not isinstance(self._unit, basestring): + return self._unit + + repo = repo or self.site + self._unit = ItemPage.from_entity_uri(repo, self._unit, lazy_load) + return self._unit + def toWikibase(self): """ Convert the data to a JSON object for the Wikibase API. diff --git a/pywikibot/page.py b/pywikibot/page.py index a268b1e..93c8b67 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -65,13 +65,13 @@ ) from pywikibot.data.api import APIError from pywikibot.family import Family -from pywikibot.site import Namespace, need_version +from pywikibot.site import DataSite, Namespace, need_version from pywikibot.tools import ( PYTHON_VERSION, MediaWikiVersion, UnicodeMixin, ComparableMixin, DotReadableDict, deprecated, deprecate_arg, deprecated_args, issue_deprecation_warning, ModuleDeprecationWrapper as _ModuleDeprecationWrapper, - first_upper, remove_last_args, _NotImplementedWarning, + first_upper, redirect_func, remove_last_args, _NotImplementedWarning, OrderedDict, Counter, ) from pywikibot.tools.ip import ip_regexp @@ -3973,6 +3973,7 @@ @rtype: ItemPage @raise NoPage: There is no corresponding ItemPage for the page + @raise WikiBaseError: The site of the page has no data repository. """ if not page.site.has_data_repository: raise pywikibot.WikiBaseError('{0} has no data repository' @@ -3994,6 +3995,40 @@ if not lazy_load and not i.exists(): raise pywikibot.NoPage(i) return i + + @classmethod + def from_entity_uri(cls, site, uri, lazy_load=False): + """ + Get the ItemPage from its entity uri. + + @param site: The Wikibase site for the item. + @type site: pywikibot.site.DataSite + @param uri: Entity uri for the Wikibase item. + @type uri: basestring + @param lazy_load: Do not raise NoPage if ItemPage does not exist. + @type lazy_load: bool + @rtype: ItemPage + + @raise TypeError: Site is not a valid DataSite. + @raise ValueError: Site does not match the base of the provided uri. + @raise NoPage: Uri points to non-existent item. + """ + if not isinstance(site, DataSite): + raise TypeError('{0} is not a data repository.'.format(site)) + + base_uri, _, qid = uri.rpartition('/') + if base_uri != site.concept_base_uri.rstrip('/'): + raise ValueError( + 'The supplied data repository ({repo}) does not correspond to ' + 'that of the item ({item})'.format( + repo=site.concept_base_uri.rstrip('/'), + item=base_uri)) + + item = cls(site, qid) + if not lazy_load and not item.exists(): + raise pywikibot.NoPage(item) + + return item def get(self, force=False, get_redirect=False, *args, **kwargs): """ @@ -4022,8 +4057,8 @@ return data @need_version('1.28-wmf.23') - def concept_url(self): - """Return the full concept URL.""" + def concept_uri(self): + """Return the full concept URI.""" return '{0}{1}'.format(self.site.concept_base_uri, self.id) def getRedirectTarget(self): @@ -4215,6 +4250,10 @@ return self._isredir return super(ItemPage, self).isRedirectPage() + # alias for backwards compatibility + concept_url = redirect_func(concept_uri, old_name='concept_url', + class_name='ItemPage') + class Property(object): diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index d652467..ef4f68b 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -219,55 +219,61 @@ def test_WbQuantity_integer(self): """Test WbQuantity for integer value.""" - q = pywikibot.WbQuantity(amount=1234, error=1) + repo = self.get_repo() + q = pywikibot.WbQuantity(amount=1234, error=1, site=repo) self.assertEqual(q.toWikibase(), {'amount': '+1234', 'lowerBound': '+1233', 'upperBound': '+1235', 'unit': '1', }) - q = pywikibot.WbQuantity(amount=5, error=(2, 3)) + q = pywikibot.WbQuantity(amount=5, error=(2, 3), site=repo) self.assertEqual(q.toWikibase(), {'amount': '+5', 'lowerBound': '+2', 'upperBound': '+7', 'unit': '1', }) - q = pywikibot.WbQuantity(amount=0, error=(0, 0)) + q = pywikibot.WbQuantity(amount=0, error=(0, 0), site=repo) self.assertEqual(q.toWikibase(), {'amount': '+0', 'lowerBound': '+0', 'upperBound': '+0', 'unit': '1', }) - q = pywikibot.WbQuantity(amount=-5, error=(2, 3)) + q = pywikibot.WbQuantity(amount=-5, error=(2, 3), site=repo) self.assertEqual(q.toWikibase(), {'amount': '-5', 'lowerBound': '-8', 'upperBound': '-3', 'unit': '1', }) def test_WbQuantity_float_27(self): """Test WbQuantity for float value.""" - q = pywikibot.WbQuantity(amount=0.044405586, error=0.0) + repo = self.get_repo() + q = pywikibot.WbQuantity(amount=0.044405586, error=0.0, site=repo) q_dict = {'amount': '+0.044405586', 'lowerBound': '+0.044405586', 'upperBound': '+0.044405586', 'unit': '1', } self.assertEqual(q.toWikibase(), q_dict) def test_WbQuantity_scientific(self): """Test WbQuantity for scientific notation.""" - q = pywikibot.WbQuantity(amount='1.3e-13', error='1e-14') + repo = self.get_repo() + q = pywikibot.WbQuantity(amount='1.3e-13', error='1e-14', site=repo) q_dict = {'amount': '+1.3e-13', 'lowerBound': '+1.2e-13', 'upperBound': '+1.4e-13', 'unit': '1', } self.assertEqual(q.toWikibase(), q_dict) def test_WbQuantity_decimal(self): """Test WbQuantity for decimal value.""" + repo = self.get_repo() q = pywikibot.WbQuantity(amount=Decimal('0.044405586'), - error=Decimal('0.0')) + error=Decimal('0.0'), site=repo) 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', error='0') + repo = self.get_repo() + q = pywikibot.WbQuantity(amount='0.044405586', error='0', site=repo) q_dict = {'amount': '+0.044405586', 'lowerBound': '+0.044405586', 'upperBound': '+0.044405586', 'unit': '1', } self.assertEqual(q.toWikibase(), q_dict) def test_WbQuantity_formatting_bound(self): """Test WbQuantity formatting with bounds.""" - q = pywikibot.WbQuantity(amount='0.044405586', error='0') + repo = self.get_repo() + q = pywikibot.WbQuantity(amount='0.044405586', error='0', site=repo) self.assertEqual("%s" % q, '{\n' ' "amount": "+%(val)s",\n' @@ -282,7 +288,8 @@ def test_WbQuantity_equality(self): """Test WbQuantity equality.""" - q = pywikibot.WbQuantity(amount='0.044405586', error='0') + repo = self.get_repo() + q = pywikibot.WbQuantity(amount='0.044405586', error='0', site=repo) self.assertEqual(q, q) def test_WbQuantity_fromWikibase(self): @@ -304,8 +311,9 @@ error=1) def test_WbQuantity_entity_unit(self): - """Test WbQuantity with entity url unit.""" - q = pywikibot.WbQuantity(amount=1234, error=1, + """Test WbQuantity with entity uri unit.""" + repo = self.get_repo() + q = pywikibot.WbQuantity(amount=1234, error=1, site=repo, unit='http://www.wikidata.org/entity/Q712226') self.assertEqual(q.toWikibase(), {'amount': '+1234', 'lowerBound': '+1233', @@ -314,9 +322,11 @@ def test_WbQuantity_unit_fromWikibase(self): """Test WbQuantity recognising unit from Wikibase output.""" + repo = self.get_repo() q = pywikibot.WbQuantity.fromWikibase({ 'amount': '+1234', 'lowerBound': '+1233', 'upperBound': '+1235', - 'unit': 'http://www.wikidata.org/entity/Q712226', }) + 'unit': 'http://www.wikidata.org/entity/Q712226', }, + site=repo) self.assertEqual(q.toWikibase(), {'amount': '+1234', 'lowerBound': '+1233', 'upperBound': '+1235', @@ -414,6 +424,31 @@ self.assertNotEqual(b, c) self.assertNotEqual(b, d) + def test_WbQuantity_get_unit_item(self): + """Test getting unit item from WbQuantity.""" + repo = self.get_repo() + q = pywikibot.WbQuantity(amount=1234, error=1, site=repo, + unit='http://www.wikidata.org/entity/Q123') + self.assertEqual(q.get_unit_item(), + ItemPage(repo, 'Q123')) + + def test_WbQuantity_get_unit_item_provide_repo(self): + """Test getting unit item from WbQuantity, providing repo.""" + repo = self.get_repo() + q = pywikibot.WbQuantity(amount=1234, error=1, + unit='http://www.wikidata.org/entity/Q123') + self.assertEqual(q.get_unit_item(repo), + ItemPage(repo, 'Q123')) + + def test_WbQuantity_get_unit_item_different_repo(self): + """Test getting unit item in different repo from WbQuantity.""" + repo = self.get_repo() + test_repo = pywikibot.Site('test', 'wikidata') + q = pywikibot.WbQuantity(amount=1234, error=1, site=repo, + unit='http://test.wikidata.org/entity/Q123') + self.assertEqual(q.get_unit_item(test_repo), + ItemPage(test_repo, 'Q123')) + class TestWbMonolingualText(WikidataTestCase): @@ -485,6 +520,7 @@ 1. by Q id 2. ItemPage.fromPage(page) 3. ItemPage.fromPage(page_with_props_loaded) + 4. ItemPage.from_entity_uri(site, uri) Test various invalid scenarios: 1. invalid Q ids @@ -809,6 +845,52 @@ # as that is what the bot operator needs to see in the log output. self.assertRaisesRegex(pywikibot.NoPage, 'Test page', item.get) + def test_from_entity_uri(self): + """Test ItemPage.from_entity_uri.""" + repo = self.get_repo() + entity_uri = 'http://www.wikidata.org/entity/Q124' + self.assertEqual(ItemPage.from_entity_uri(repo, entity_uri), + ItemPage(repo, 'Q124')) + + def test_from_entity_uri_not_a_data_repo(self): + """Test ItemPage.from_entity_uri with a non-Wikibase site.""" + repo = self.site + entity_uri = 'http://www.wikidata.org/entity/Q124' + self.assertRaises(TypeError, + ItemPage.from_entity_uri, repo, entity_uri) + + def test_from_entity_uri_wrong_repo(self): + """Test ItemPage.from_entity_uri with unexpected item repo.""" + repo = self.get_repo() + entity_uri = 'http://test.wikidata.org/entity/Q124' + self.assertRaises(ValueError, + ItemPage.from_entity_uri, repo, entity_uri) + + def test_from_entity_uri_invalid_title(self): + """Test ItemPage.from_entity_uri with an invalid item title format.""" + repo = self.get_repo() + entity_uri = 'http://www.wikidata.org/entity/Nonsense' + self.assertRaises(pywikibot.InvalidTitle, + ItemPage.from_entity_uri, repo, entity_uri) + + def test_from_entity_uri_no_item(self): + """Test ItemPage.from_entity_uri with non-exitent item.""" + repo = self.get_repo() + entity_uri = 'http://www.wikidata.org/entity/Q999999999999999999' + self.assertRaises(pywikibot.NoPage, + ItemPage.from_entity_uri, repo, entity_uri) + + def test_from_entity_uri_no_item_lazy(self): + """Test ItemPage.from_entity_uri with lazy loaded non-exitent item.""" + repo = self.get_repo() + entity_uri = 'http://www.wikidata.org/entity/Q999999999999999999' + expected_item = ItemPage(repo, 'Q999999999999999999') + self.assertEqual( + ItemPage.from_entity_uri(repo, entity_uri, lazy_load=True), + expected_item) + + self.assertFalse(expected_item.exists()) # ensure actually missing + class TestRedirects(WikidataTestCase): -- To view, visit https://gerrit.wikimedia.org/r/339389 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9746881ada22cb7dd47a76c0597737f063cd31f6 Gerrit-PatchSet: 5 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, 2 months

Errored: wikimedia/pywikibot-core#3893 (master - 3cff42e)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3893 Status: Errored Duration: 1 hour, 41 minutes, and 36 seconds Commit: 3cff42e (master) Author: jenkins-bot Message: Merge "Avoid ResourceWarning using subprocess in python 3.6" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/f29c9f2069e1...3cff42e7… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/208382597 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

7 years, 2 months

← Newer
1
...
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits March 2017