]> projects.mako.cc - python-simplemediawiki.debian/commitdiff
merge patched into master
authorBenjamin Mako Hill <mako@atdot.cc>
Mon, 9 Apr 2012 22:13:42 +0000 (18:13 -0400)
committerBenjamin Mako Hill <mako@atdot.cc>
Mon, 9 Apr 2012 22:13:42 +0000 (18:13 -0400)
1  2 
debian/.git-dpm
debian/patches/0001-Fix-not-being-able-to-import-the-module.patch
debian/patches/0002-Import-iso8601-in-a-way-that-makes-pylint-happy.patch
debian/patches/0003-Refactor-normalize_api_url.patch
debian/patches/0004-There-s-no-good-way-to-import-iso8601-apparently.patch
debian/patches/0005-Add-docstring-to-_fetch_http.patch
debian/patches/0006-Forget-about-version-checking-for-right-now.patch
debian/patches/0007-use-setuptools-if-available.patch
debian/patches/series

diff --combined debian/.git-dpm
index 2095053ffdb8d99af2ddf5f6855934853a0e3e34,0000000000000000000000000000000000000000..6a25c22933c4d5d38b51f11a2e5d21b6b7dfe773
mode 100644,000000..100644
--- /dev/null
@@@ -1,8 -1,0 +1,8 @@@
- 49b148ee4c10fdf671288331217bd4dd0304b8b4
- 49b148ee4c10fdf671288331217bd4dd0304b8b4
 +# see git-dpm(1) from git-dpm package
++b1031465666db28694e2eb69c81d9ce33857f09a
++b1031465666db28694e2eb69c81d9ce33857f09a
 +04a25c76a33802f39e2afe4989d822c010a7e863
 +04a25c76a33802f39e2afe4989d822c010a7e863
 +python-simplemediawiki_1.0.2.orig.tar.gz
 +9e4e0ad20c0bf2df975e9f81ad0d791644598598
 +12353
index 8154aefcf3bca14578aa7ed1b65c6020b5dcf67e,0000000000000000000000000000000000000000..a561d6d56dd9dfafb6a60bf348fa2397e92134c5
mode 100644,000000..100644
--- /dev/null
@@@ -1,40 -1,0 +1,37 @@@
- -- 
- 1.7.2.3
 +From a54cc1e6cdfacf678711f6c88021c8eca5c6580c Mon Sep 17 00:00:00 2001
 +From: Ian Weller <ian@ianweller.org>
 +Date: Fri, 4 Feb 2011 22:06:35 -0600
 +Subject: Fix not being able to import the module
 +
 +---
 + simplemediawiki.py |   13 ++++++-------
 + 1 files changed, 6 insertions(+), 7 deletions(-)
 +
 +diff --git a/simplemediawiki.py b/simplemediawiki.py
 +index ab0f3f7..6bdd944 100644
 +--- a/simplemediawiki.py
 ++++ b/simplemediawiki.py
 +@@ -39,6 +39,12 @@ from StringIO import StringIO
 + import urllib
 + import urllib2
 + 
 ++__author__ = 'Ian Weller <ian@ianweller.org>'
 ++__version__ = '1.0.2'
 ++DEFAULT_UA = ('python-simplemediawiki/%s '
 ++              '+https://github.com/ianweller/python-simplemediawiki') \
 ++        % __version__
 ++
 + 
 + class MediaWiki():
 +     """
 +@@ -206,10 +212,3 @@ class MediaWiki():
 +         objects.
 +         """
 +         return iso8601.parse_date(date)
 +-
 +-
 +-__author__ = 'Ian Weller <ian@ianweller.org>'
 +-__version__ = '1.0.2'
 +-DEFAULT_UA = 'python-simplemediawiki/%s ' + \
 +-        '+https://github.com/ianweller/python-simplemediawiki' \
 +-        % __version__
index 5c55bcb3b8c7e8cc10629cc07af8fbc38b9d2d81,0000000000000000000000000000000000000000..b4bb013af429f344759d36d025055c4891592693
mode 100644,000000..100644
--- /dev/null
@@@ -1,25 -1,0 +1,22 @@@
- -- 
- 1.7.2.3
 +From 9ce74c8ebc5ac8ee818ec122c89531b1d1b4c9ac Mon Sep 17 00:00:00 2001
 +From: Ian Weller <ian@ianweller.org>
 +Date: Fri, 4 Feb 2011 22:10:54 -0600
 +Subject: Import iso8601 in a way that makes pylint happy
 +
 +---
 + simplemediawiki.py |    2 +-
 + 1 files changed, 1 insertions(+), 1 deletions(-)
 +
 +diff --git a/simplemediawiki.py b/simplemediawiki.py
 +index 6bdd944..ff879ed 100644
 +--- a/simplemediawiki.py
 ++++ b/simplemediawiki.py
 +@@ -33,7 +33,7 @@ of namespaces are provided for your convenience.
 + 
 + import cookielib
 + import gzip
 +-from iso8601 import iso8601
 ++import iso8601.iso8601 as iso8601
 + import json
 + from StringIO import StringIO
 + import urllib
index 8a2566b480c41eaff459ec4db1d4e54cf6a80d56,0000000000000000000000000000000000000000..f484aacf45a8cff7e9a2a71e6c5176ba4a19549c
mode 100644,000000..100644
--- /dev/null
@@@ -1,78 -1,0 +1,75 @@@
- -- 
- 1.7.2.3
 +From de97f3ccde6527ac63bde701ae759291d93d1aa4 Mon Sep 17 00:00:00 2001
 +From: Ian Weller <ian@ianweller.org>
 +Date: Fri, 4 Feb 2011 23:58:26 -0600
 +Subject: Refactor normalize_api_url
 +
 +---
 + simplemediawiki.py |   42 +++++++++++++++++++++++-------------------
 + 1 files changed, 23 insertions(+), 19 deletions(-)
 +
 +diff --git a/simplemediawiki.py b/simplemediawiki.py
 +index ff879ed..e123a5b 100644
 +--- a/simplemediawiki.py
 ++++ b/simplemediawiki.py
 +@@ -101,7 +101,28 @@ 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',
 ++                                              '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)
 ++
 ++        data, data_json = tester(self, self._api_url)
 +         if data_json:
 +             return self._api_url
 +         else:
 +@@ -109,30 +130,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):
 +         """
index 0d6c506b9a6e029a58a9d8527a9d9e8ee9756952,0000000000000000000000000000000000000000..9ff6be65c74bcb7b475fc5485be82753ae6243ac
mode 100644,000000..100644
--- /dev/null
@@@ -1,25 -1,0 +1,22 @@@
- -- 
- 1.7.2.3
 +From efa6e86fcf1586602e39253bca8a7abf5de34efe Mon Sep 17 00:00:00 2001
 +From: Ian Weller <ian@ianweller.org>
 +Date: Sat, 5 Feb 2011 00:00:31 -0600
 +Subject: There's no good way to import iso8601, apparently
 +
 +---
 + simplemediawiki.py |    2 +-
 + 1 files changed, 1 insertions(+), 1 deletions(-)
 +
 +diff --git a/simplemediawiki.py b/simplemediawiki.py
 +index e123a5b..f039c5a 100644
 +--- a/simplemediawiki.py
 ++++ b/simplemediawiki.py
 +@@ -33,7 +33,7 @@ of namespaces are provided for your convenience.
 + 
 + import cookielib
 + import gzip
 +-import iso8601.iso8601 as iso8601
 ++import iso8601
 + import json
 + from StringIO import StringIO
 + import urllib
index 008fb9ea5e96ee8705b424efb0c2fd4ff98f4fdc,0000000000000000000000000000000000000000..9e0d73ac6d23c4244b1826c7a1d5c8dd6df23271
mode 100644,000000..100644
--- /dev/null
@@@ -1,27 -1,0 +1,24 @@@
- -- 
- 1.7.2.3
 +From bed00dea090ba51e33981e0b6784f23253d4f74a Mon Sep 17 00:00:00 2001
 +From: Ian Weller <ian@ianweller.org>
 +Date: Sat, 5 Feb 2011 00:00:46 -0600
 +Subject: Add docstring to _fetch_http
 +
 +---
 + simplemediawiki.py |    4 ++++
 + 1 files changed, 4 insertions(+), 0 deletions(-)
 +
 +diff --git a/simplemediawiki.py b/simplemediawiki.py
 +index f039c5a..2934ab9 100644
 +--- a/simplemediawiki.py
 ++++ b/simplemediawiki.py
 +@@ -74,6 +74,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)
index 09d3a5a364b757fc2bcc1e76e2aea384cce26f1c,0000000000000000000000000000000000000000..7834548de09afb4d0bbd8d520a20a82604f4c656
mode 100644,000000..100644
--- /dev/null
@@@ -1,43 -1,0 +1,40 @@@
- -- 
- 1.7.2.3
 +From 49b148ee4c10fdf671288331217bd4dd0304b8b4 Mon Sep 17 00:00:00 2001
 +From: Ian Weller <ian@ianweller.org>
 +Date: Sat, 5 Feb 2011 00:31:07 -0600
 +Subject: Forget about version checking for right now
 +
 +---
 + simplemediawiki.py |   11 +----------
 + 1 files changed, 1 insertions(+), 10 deletions(-)
 +
 +diff --git a/simplemediawiki.py b/simplemediawiki.py
 +index 2934ab9..ec12a11 100644
 +--- a/simplemediawiki.py
 ++++ b/simplemediawiki.py
 +@@ -55,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
 +@@ -111,17 +110,9 @@ class MediaWiki():
 +             in order to test whether the given URL will return JSON.
 +             """
 +             data = self._fetch_http(api_url, {'action': 'query',
 +-                                              'meta': 'siteinfo',
 +-                                              'siprop': 'general',
 +-                                              'format': 'json'})
 ++                                              'meta': 'siteinfo'})
 +             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)
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..aae8aa072a563b9295eef5b2257b30eafdf980fa
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,32 @@@
++From b1031465666db28694e2eb69c81d9ce33857f09a Mon Sep 17 00:00:00 2001
++From: Benjamin Mako Hill <mako@atdot.cc>
++Date: Mon, 9 Apr 2012 18:13:37 -0400
++Subject: use setuptools if available
++
++---
++ setup.py |    8 ++++++--
++ 1 files changed, 6 insertions(+), 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 79a2b1e..fb1768e 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -1,4 +1,8 @@
++-from distutils.core import setup
+++try:
+++    from setuptools import setup
+++except ImportError:
+++    from distutils.core import setup
+++
++ setup(name='simplemediawiki',
++       version='1.0.2',
++       description='Extremely low-level wrapper to the MediaWiki API',
++@@ -11,7 +15,7 @@ setup(name='simplemediawiki',
++           'License :: OSI Approved :: GNU Library or Lesser General Public '
++           'License (LGPL)',
++       ],
++-      requires=[
+++      install_requires=[
++           'iso8601',
++       ],
++       py_modules=['simplemediawiki'])
diff --combined debian/patches/series
index 4cfcd0850f632213450c887c900063c0c1225349,0000000000000000000000000000000000000000..a70b490a697259295f91964896e43be15fde44aa
mode 100644,000000..100644
--- /dev/null
@@@ -1,6 -1,0 +1,7 @@@
 +0001-Fix-not-being-able-to-import-the-module.patch
 +0002-Import-iso8601-in-a-way-that-makes-pylint-happy.patch
 +0003-Refactor-normalize_api_url.patch
 +0004-There-s-no-good-way-to-import-iso8601-apparently.patch
 +0005-Add-docstring-to-_fetch_http.patch
 +0006-Forget-about-version-checking-for-right-now.patch
++0007-use-setuptools-if-available.patch

Benjamin Mako Hill || Want to submit a patch?