X-Git-Url: https://projects.mako.cc/source/python-simplemediawiki.debian/blobdiff_plain/c305ac0f210568c9b6ab0cd41710e7996814ba0a..10ccfd5025e85c972884d608f23169c6ad23aa6f:/simplemediawiki.py?ds=sidebyside diff --git a/simplemediawiki.py b/simplemediawiki.py index c74fc66..ec12a11 100644 --- a/simplemediawiki.py +++ b/simplemediawiki.py @@ -33,12 +33,18 @@ of namespaces are provided for your convenience. import cookielib import gzip -from iso8601 import iso8601 +import iso8601 import json from StringIO import StringIO import urllib import urllib2 +__author__ = 'Ian Weller ' +__version__ = '1.0.2' +DEFAULT_UA = ('python-simplemediawiki/%s ' + '+https://github.com/ianweller/python-simplemediawiki') \ + % __version__ + class MediaWiki(): """ @@ -49,7 +55,6 @@ class MediaWiki(): _high_limits = None _namespaces = None _psuedo_namespaces = None - _mediawiki_version = None def __init__(self, api_url, cookie_file=None, user_agent=DEFAULT_UA): self._api_url = api_url @@ -68,6 +73,10 @@ class MediaWiki(): self._opener.addheaders = [('User-agent', user_agent)] def _fetch_http(self, url, params): + """ + Standard HTTP request handler for this class with gzip and cookie + support. + """ request = urllib2.Request(url, urllib.urlencode(params)) request.add_header('Accept-encoding', 'gzip') response = self._opener.open(request) @@ -95,7 +104,20 @@ class MediaWiki(): returns that URL, while also helpfully setting this object's API URL to it. If it can't magically conjure an API endpoint, it returns False. """ - data, data_json = self._normalize_api_url_tester(self._api_url) + def tester(self, api_url): + """ + Attempts to fetch general information about the MediaWiki instance + in order to test whether the given URL will return JSON. + """ + data = self._fetch_http(api_url, {'action': 'query', + 'meta': 'siteinfo'}) + try: + data_json = json.loads(data) + return (data, data_json) + except ValueError: + return (data, None) + + data, data_json = tester(self, self._api_url) if data_json: return self._api_url else: @@ -103,30 +125,13 @@ class MediaWiki(): if 'index.php' in self._api_url: test_api_url = self._api_url.split('index.php')[0] + 'api.php' print test_api_url - test_data, test_data_json = \ - self._normalize_api_url_tester(test_api_url) + test_data, test_data_json = tester(self, test_api_url) print (test_data, test_data_json) if test_data_json: self._api_url = test_api_url return self._api_url return False - def _normalize_api_url_tester(self, api_url): - data = self._fetch_http(api_url, {'action': 'query', - 'meta': 'siteinfo', - 'siprop': 'general', - 'format': 'json'}) - try: - data_json = json.loads(data) - # may as well set the version - try: - version_string = data_json['query']['general']['generator'] - self._mediawiki_version = version_string.split(' ', 1)[1] - except KeyError: - pass - return (data, data_json) - except ValueError: - return (data, None) def login(self, user, passwd, token=None): """ @@ -206,10 +211,3 @@ class MediaWiki(): objects. """ return iso8601.parse_date(date) - - -__author__ = 'Ian Weller ' -__version__ = '1.0.1' -DEFAULT_UA = 'python-simplemediawiki/%s ' + \ - '+https://github.com/ianweller/python-simplemediawiki' \ - % __version__