jenkins-bot has submitted this change and it was merged. Change subject: Store the 'entity' url of a globe separately ...................................................................... Store the 'entity' url of a globe separately Currently we simply use the globe name and convert back and forth from the entity url. This causes an issue when we do not have the globe hardcoded. Now we store the entity url separately and only fallback upon globes if the entity url is not set. Change-Id: I942d391be8298bf046cd013332ea24687339bb51 --- M pywikibot/__init__.py 1 file changed, 13 insertions(+), 14 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 73947ec..77189df 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -95,7 +95,7 @@ in the future we can use it for the GeoData extension. """ def __init__(self, lat, lon, alt=None, precision=None, globe='earth', - typ="", name="", dim=None, site=None): + typ="", name="", dim=None, site=None, entity=''): """ @param lat: Latitude @type lat: float @@ -112,12 +112,15 @@ @type name: str @param dim: Dimension (in meters) @type dim: int + @param entity: The url entity of a Wikibase item + @type entity: str """ self.lat = lat self.lon = lon self.alt = alt self._precision = precision self.globe = globe.lower() + self._entity = entity self.type = typ self.name = name self._dim = dim @@ -125,15 +128,6 @@ self.site = Site().data_repository() else: self.site = site - #Copied from [[mw:Extension:GeoData]] - if not self.globe in ['earth', 'mercury', 'venus', 'moon', - 'mars', 'phobos', 'deimos', 'ganymede', - 'callisto', 'io', 'europa', 'mimas', - 'enceladus', 'tethys', 'dione', - 'rhea', 'titan', 'hyperion', 'iapetus', - 'phoebe', 'miranda', 'ariel', 'umbriel', - 'titania', 'oberon', 'triton', 'pluto']: - raise ValueError(u"%s is not a supported globe." % self.globe) def __repr__(self): string = 'Coordinate(%s, %s' % (self.lat, self.lon) @@ -141,6 +135,12 @@ string += ', globe="%s"' % self.globe string += ')' return string + + @property + def entity(self): + if self._entity: + return self._entity + return self.site.globes()[self.globe] def toWikibase(self): """ @@ -153,7 +153,7 @@ return {'latitude': self.lat, 'longitude': self.lon, 'altitude': self.alt, - 'globe': self.site.globes()[self.globe], + 'globe': self.entity, 'precision': self.precision, } @@ -166,15 +166,14 @@ globekey = data['globe'] if globekey: - # FIXME: Should probably use get() with some error handling when it's an unknown globe - globe = globes[data['globe']] + globe = globes.get(data['globe']) else: # Default to earth or should we use None here? globe = 'earth' return Coordinate(data['latitude'], data['longitude'], data['altitude'], data['precision'], - globe, site=site) + globe, site=site, entity=data['globe']) @property def precision(self): -- To view, visit https://gerrit.wikimedia.org/r/78623 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I942d391be8298bf046cd013332ea24687339bb51 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: Sk!d <swuensch(a)gmail.com> Gerrit-Reviewer: jenkins-bot