Dalba has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/390872 )
Change subject: Normalize wikibase related URIs to 'https'
......................................................................
Normalize wikibase related URIs to 'https'
This patch is a follow-up to cf84e4f616372289239e76fa0ac08896c4eb2f26 which
was causing some tests.
Wikibase API responses may contain 'http://' URIs, normalize them
to 'https://'.
Change-Id: I769dca0bb9e62c2c5695f344d2757ea3ad50f53a
---
M pywikibot/__init__.py
M pywikibot/page.py
M tests/pages/Q60.wd
3 files changed, 52 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/72/390872/1
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 6404b19..6c7f74d 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -333,7 +333,7 @@
return {'latitude': self.lat,
'longitude': self.lon,
'altitude': self.alt,
- 'globe': self.entity,
+ 'globe': self.entity.replace('http://', 'https://', 1),
'precision': self.precision,
}
@@ -556,7 +556,7 @@
if site is None:
raise ValueError('Site %s has no data repository' % Site())
calendarmodel = site.calendarmodel()
- self.calendarmodel = calendarmodel
+ self.calendarmodel = calendarmodel.replace('http://', 'https://', 1)
# if precision is given it overwrites the autodetection above
if precision is not None:
@@ -840,7 +840,7 @@
json = {'amount': self._fromdecimal(self.amount),
'upperBound': self._fromdecimal(self.upperBound),
'lowerBound': self._fromdecimal(self.lowerBound),
- 'unit': self.unit
+ 'unit': self.unit.replace('http://', 'https://', 1)
}
return json
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 10144b8..71132e3 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -4243,8 +4243,8 @@
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('/'):
+ base_uri, _, qid = uri.partition('//')[2].rpartition('/')
+ if base_uri != site.concept_base_uri.partition('//')[2].rstrip('/'):
raise ValueError(
'The supplied data repository ({repo}) does not correspond to '
'that of the item ({item})'.format(
diff --git a/tests/pages/Q60.wd b/tests/pages/Q60.wd
index b242c7d..b21fcd8 100644
--- a/tests/pages/Q60.wd
+++ b/tests/pages/Q60.wd
@@ -1916,7 +1916,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -1935,7 +1935,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -1977,7 +1977,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -1996,7 +1996,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2038,7 +2038,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2057,7 +2057,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2099,7 +2099,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2118,7 +2118,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2160,7 +2160,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2179,7 +2179,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2221,7 +2221,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2240,7 +2240,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2282,7 +2282,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2301,7 +2301,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2343,7 +2343,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2362,7 +2362,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2404,7 +2404,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2423,7 +2423,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2465,7 +2465,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2484,7 +2484,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2526,7 +2526,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2545,7 +2545,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2587,7 +2587,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2606,7 +2606,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2648,7 +2648,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2667,7 +2667,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2709,7 +2709,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2728,7 +2728,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2770,7 +2770,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2789,7 +2789,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2831,7 +2831,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2850,7 +2850,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2892,7 +2892,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2911,7 +2911,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2953,7 +2953,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -2972,7 +2972,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -3030,7 +3030,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -3049,7 +3049,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -3107,7 +3107,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -3126,7 +3126,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -3184,7 +3184,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -3203,7 +3203,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -3245,7 +3245,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -3272,7 +3272,7 @@
"longitude": -73.94,
"altitude": null,
"precision": 0.00027777777777778,
- "globe": "http://www.wikidata.org/entity/Q2";
+ "globe": "https://www.wikidata.org/entity/Q2";
},
"type": "globecoordinate"
}
@@ -3487,7 +3487,7 @@
"before": 0,
"after": 0,
"precision": 9,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -3681,7 +3681,7 @@
"before": 0,
"after": 0,
"precision": 9,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
@@ -3734,7 +3734,7 @@
"before": 0,
"after": 0,
"precision": 11,
- "calendarmodel":
"http://www.wikidata.org/entity/Q1985727";
+ "calendarmodel":
"https://www.wikidata.org/entity/Q1985727";
},
"type": "time"
}
--
To view, visit https://gerrit.wikimedia.org/r/390872
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I769dca0bb9e62c2c5695f344d2757ea3ad50f53a
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba <dalba.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
