merge patched into master
[python-simplemediawiki.debian] / debian / patches / 0006-Forget-about-version-checking-for-right-now.patch
1 From 49b148ee4c10fdf671288331217bd4dd0304b8b4 Mon Sep 17 00:00:00 2001
2 From: Ian Weller <ian@ianweller.org>
3 Date: Sat, 5 Feb 2011 00:31:07 -0600
4 Subject: Forget about version checking for right now
5
6 ---
7  simplemediawiki.py |   11 +----------
8  1 files changed, 1 insertions(+), 10 deletions(-)
9
10 diff --git a/simplemediawiki.py b/simplemediawiki.py
11 index 2934ab9..ec12a11 100644
12 --- a/simplemediawiki.py
13 +++ b/simplemediawiki.py
14 @@ -55,7 +55,6 @@ class MediaWiki():
15      _high_limits = None
16      _namespaces = None
17      _psuedo_namespaces = None
18 -    _mediawiki_version = None
19  
20      def __init__(self, api_url, cookie_file=None, user_agent=DEFAULT_UA):
21          self._api_url = api_url
22 @@ -111,17 +110,9 @@ class MediaWiki():
23              in order to test whether the given URL will return JSON.
24              """
25              data = self._fetch_http(api_url, {'action': 'query',
26 -                                              'meta': 'siteinfo',
27 -                                              'siprop': 'general',
28 -                                              'format': 'json'})
29 +                                              'meta': 'siteinfo'})
30              try:
31                  data_json = json.loads(data)
32 -                # may as well set the version
33 -                try:
34 -                    version_string = data_json['query']['general']['generator']
35 -                    self._mediawiki_version = version_string.split(' ', 1)[1]
36 -                except KeyError:
37 -                    pass
38                  return (data, data_json)
39              except ValueError:
40                  return (data, None)
41 -- 
42 1.7.2.3
43

Benjamin Mako Hill || Want to submit a patch?