jenkins-bot has submitted this change and it was merged.
Change subject: Same hostname for HTTPS by default (for Wikimedia sites) ......................................................................
Same hostname for HTTPS by default (for Wikimedia sites)
https://secure.wikimedia.org/family/lang has been migrated to https://lang.family.org/. Using the former makes the bot hang after getting a 301 response.
Change-Id: I633eae80b60f924dec4c78b83d8aa8690e31a1a3 --- M pywikibot/family.py 1 file changed, 4 insertions(+), 5 deletions(-)
Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified
diff --git a/pywikibot/family.py b/pywikibot/family.py index d1f2b41..362d893 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -912,7 +912,7 @@
def ssl_hostname(self, code): """The hostname to use for SSL connections.""" - return "secure.wikimedia.org" + return self.hostname(code)
def scriptpath(self, code): """The prefix used to locate scripts on this wiki. @@ -929,10 +929,9 @@ return '/w'
def ssl_pathprefix(self, code): - """The path prefix for secure.wikimedia.org access.""" - # Override this ONLY if the wiki family uses a different path - # pattern than /familyname/languagecode - return "/%s/%s" % (self.name, code) + """The path prefix for secure HTTP access.""" + # Override this ONLY if the wiki family requires a path prefix + return ''
def path(self, code): return '%s/index.php' % self.scriptpath(code)