Ricordisamoa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/130637
Change subject: make WbTime's calendarmodel depend on the family
......................................................................
make WbTime's calendarmodel depend on the family
thus complying with the framework's WMF-agnosticism
also fixed some minor typos
Change-Id: Iac89303435ab45f05ed1c2fabba9a531d27142b5
---
M pywikibot/__init__.py
M pywikibot/families/wikidata_family.py
M tests/wikibase_tests.py
3 files changed, 9 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/37/130637/1
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index ef50bfc..a21bc06 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -215,7 +215,7 @@
FORMATSTR = '{0:+012d}-{1:02d}-{2:02d}T{3:02d}:{4:02d}:{5:02d}Z'
def __init__(self, year=None, month=None, day=None, hour=None,
minute=None, second=None, precision=None, before=0,
- after=0, timezone=0,
calendarmodel='http://www.wikidata.org/entity/Q1985727'):
+ after=0, timezone=0, calendarmodel=None):
"""
Creates a new WbTime object. The precision can be set
by the Wikibase int value (0-14) or by a human readable
@@ -249,6 +249,8 @@
self.after = after
self.before = before
self.timezone = timezone
+ if calendarmodel is None:
+ calendarmodel = Site().data_repository().calendarmodel()
self.calendarmodel = calendarmodel
# if precision is given it overwrites the autodetection above
@@ -262,7 +264,7 @@
@staticmethod
def fromTimestr(datetimestr, precision=14, before=0, after=0, timezone=0,
- calendarmodel='http://www.wikidata.org/entity/Q1985727'):
+ calendarmodel=None):
match = re.match('([-+]?\d+)-(\d+)-(\d+)T(\d+):(\d+):(\d+)Z',
datetimestr)
if not match:
raise ValueError(u"Invalid format: '%s'" % datetimestr)
diff --git a/pywikibot/families/wikidata_family.py
b/pywikibot/families/wikidata_family.py
index 3debaed..d8442c5 100644
--- a/pywikibot/families/wikidata_family.py
+++ b/pywikibot/families/wikidata_family.py
@@ -4,7 +4,7 @@
from pywikibot import family
-# The wikidata family
+# The Wikidata family
class Family(family.WikimediaFamily):
@@ -26,6 +26,9 @@
else:
return (code, self.name)
+ def calendarmodel(self, code):
+ return 'http://www.wikidata.org/entity/Q1985727'
+
def globes(self, code):
"""Supported globes for Coordinate datatype"""
return {
diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py
index d1338ad..8b811b3 100644
--- a/tests/wikibase_tests.py
+++ b/tests/wikibase_tests.py
@@ -62,7 +62,7 @@
class TestLinks(PywikibotTestCase):
- """Test cases to test links stored in wikidata"""
+ """Test cases to test links stored in Wikidata"""
def setUp(self):
super(TestLinks, self).setUp()
self.wdp = pywikibot.ItemPage(wikidata, 'Q60')
--
To view, visit https://gerrit.wikimedia.org/r/130637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac89303435ab45f05ed1c2fabba9a531d27142b5
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa <ricordisa...@live.it>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
