From 518785eac12f5ae54a26d511d02bd16cd6b1611e Mon Sep 17 00:00:00 2001 From: Dan Blanchard Date: Tue, 14 Mar 2017 16:38:07 -0400 Subject: [PATCH 1/2] Make passing `lang` to `MediaWiki.__init__` work Without this you have to pass both `url` and `lang` to get a non-English Wikipedia to work. --- mediawiki/mediawiki.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediawiki/mediawiki.py b/mediawiki/mediawiki.py index e12204a..82dc3dd 100644 --- a/mediawiki/mediawiki.py +++ b/mediawiki/mediawiki.py @@ -41,7 +41,7 @@ def __init__(self, url='http://en.wikipedia.org/w/api.php', lang='en', ''' Init Function ''' self._version = VERSION self._api_url = url - self._lang = lang # should this call self.language = lang? + self.language = lang # Make sure URL is updated for language self._timeout = timeout self._user_agent = ('python-mediawiki/VERSION-{0}' '/({1})/BOT').format(VERSION, URL) From c816d5c3c2d720e6aeea549837a9617fe2bf5d9f Mon Sep 17 00:00:00 2001 From: Dan Blanchard Date: Tue, 14 Mar 2017 16:44:02 -0400 Subject: [PATCH 2/2] Make default api_url language specific --- mediawiki/mediawiki.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mediawiki/mediawiki.py b/mediawiki/mediawiki.py index 82dc3dd..699e7d8 100644 --- a/mediawiki/mediawiki.py +++ b/mediawiki/mediawiki.py @@ -35,13 +35,13 @@ class MediaWiki(object): :type rate_limit_wait: timedelta ''' - def __init__(self, url='http://en.wikipedia.org/w/api.php', lang='en', + def __init__(self, url='http://{lang}.wikipedia.org/w/api.php', lang='en', timeout=None, rate_limit=False, rate_limit_wait=timedelta(milliseconds=50)): ''' Init Function ''' self._version = VERSION - self._api_url = url - self.language = lang # Make sure URL is updated for language + self._api_url = url.format(lang=lang) + self._lang = lang self._timeout = timeout self._user_agent = ('python-mediawiki/VERSION-{0}' '/({1})/BOT').format(VERSION, URL) @@ -217,7 +217,7 @@ def memoized(self): return self._cache # non-properties - def set_api_url(self, api_url='http://en.wikipedia.org/w/api.php', + def set_api_url(self, api_url='http://{lang}.wikipedia.org/w/api.php', lang='en'): ''' Set the API URL and language @@ -231,7 +231,7 @@ def set_api_url(self, api_url='http://en.wikipedia.org/w/api.php', ''' old_api_url = self._api_url old_lang = self._lang - self._api_url = api_url + self._api_url = api_url.format(lang=lang) self._lang = lang try: self._get_site_info()