merge patched into master

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 2095053ffdb8d99af2ddf5f6855934853a0e3e34..6a25c22933c4d5d38b51f11a2e5d21b6b7dfe773 100644 (file)
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-49b148ee4c10fdf671288331217bd4dd0304b8b4
-49b148ee4c10fdf671288331217bd4dd0304b8b4
+b1031465666db28694e2eb69c81d9ce33857f09a
+b1031465666db28694e2eb69c81d9ce33857f09a
 04a25c76a33802f39e2afe4989d822c010a7e863
 04a25c76a33802f39e2afe4989d822c010a7e863
 python-simplemediawiki_1.0.2.orig.tar.gz

diff --git a/debian/patches/0001-Fix-not-being-able-to-import-the-module.patch b/debian/patches/0001-Fix-not-being-able-to-import-the-module.patch
index 8154aefcf3bca14578aa7ed1b65c6020b5dcf67e..a561d6d56dd9dfafb6a60bf348fa2397e92134c5 100644 (file)
--- a/debian/patches/0001-Fix-not-being-able-to-import-the-module.patch
+++ b/debian/patches/0001-Fix-not-being-able-to-import-the-module.patch
@@ -35,6 +35,3 @@ index ab0f3f7..6bdd944 100644
 -DEFAULT_UA = 'python-simplemediawiki/%s ' + \
 -        '+https://github.com/ianweller/python-simplemediawiki' \
 -        % __version__
--- 
-1.7.2.3
-

diff --git a/debian/patches/0002-Import-iso8601-in-a-way-that-makes-pylint-happy.patch b/debian/patches/0002-Import-iso8601-in-a-way-that-makes-pylint-happy.patch
index 5c55bcb3b8c7e8cc10629cc07af8fbc38b9d2d81..b4bb013af429f344759d36d025055c4891592693 100644 (file)
--- a/debian/patches/0002-Import-iso8601-in-a-way-that-makes-pylint-happy.patch
+++ b/debian/patches/0002-Import-iso8601-in-a-way-that-makes-pylint-happy.patch
@@ -20,6 +20,3 @@ index 6bdd944..ff879ed 100644
  import json
  from StringIO import StringIO
  import urllib
--- 
-1.7.2.3
-

diff --git a/debian/patches/0003-Refactor-normalize_api_url.patch b/debian/patches/0003-Refactor-normalize_api_url.patch
index 8a2566b480c41eaff459ec4db1d4e54cf6a80d56..f484aacf45a8cff7e9a2a71e6c5176ba4a19549c 100644 (file)
--- a/debian/patches/0003-Refactor-normalize_api_url.patch
+++ b/debian/patches/0003-Refactor-normalize_api_url.patch
@@ -73,6 +73,3 @@ index ff879ed..e123a5b 100644
  
      def login(self, user, passwd, token=None):
          """
--- 
-1.7.2.3
-

diff --git a/debian/patches/0004-There-s-no-good-way-to-import-iso8601-apparently.patch b/debian/patches/0004-There-s-no-good-way-to-import-iso8601-apparently.patch
index 0d6c506b9a6e029a58a9d8527a9d9e8ee9756952..9ff6be65c74bcb7b475fc5485be82753ae6243ac 100644 (file)
--- a/debian/patches/0004-There-s-no-good-way-to-import-iso8601-apparently.patch
+++ b/debian/patches/0004-There-s-no-good-way-to-import-iso8601-apparently.patch
@@ -20,6 +20,3 @@ index e123a5b..f039c5a 100644
  import json
  from StringIO import StringIO
  import urllib
--- 
-1.7.2.3
-

diff --git a/debian/patches/0005-Add-docstring-to-_fetch_http.patch b/debian/patches/0005-Add-docstring-to-_fetch_http.patch
index 008fb9ea5e96ee8705b424efb0c2fd4ff98f4fdc..9e0d73ac6d23c4244b1826c7a1d5c8dd6df23271 100644 (file)
--- a/debian/patches/0005-Add-docstring-to-_fetch_http.patch
+++ b/debian/patches/0005-Add-docstring-to-_fetch_http.patch
@@ -22,6 +22,3 @@ index f039c5a..2934ab9 100644
          request = urllib2.Request(url, urllib.urlencode(params))
          request.add_header('Accept-encoding', 'gzip')
          response = self._opener.open(request)
--- 
-1.7.2.3
-

diff --git a/debian/patches/0006-Forget-about-version-checking-for-right-now.patch b/debian/patches/0006-Forget-about-version-checking-for-right-now.patch
index 09d3a5a364b757fc2bcc1e76e2aea384cce26f1c..7834548de09afb4d0bbd8d520a20a82604f4c656 100644 (file)
--- a/debian/patches/0006-Forget-about-version-checking-for-right-now.patch
+++ b/debian/patches/0006-Forget-about-version-checking-for-right-now.patch
@@ -38,6 +38,3 @@ index 2934ab9..ec12a11 100644
                  return (data, data_json)
              except ValueError:
                  return (data, None)
--- 
-1.7.2.3
-

diff --git a/debian/patches/0007-use-setuptools-if-available.patch b/debian/patches/0007-use-setuptools-if-available.patch
new file mode 100644 (file)
index 0000000..aae8aa0
--- /dev/null
+++ b/debian/patches/0007-use-setuptools-if-available.patch
@@ -0,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 --git a/debian/patches/series b/debian/patches/series
index 4cfcd0850f632213450c887c900063c0c1225349..a70b490a697259295f91964896e43be15fde44aa 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 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

diff --git a/setup.py b/setup.py
index 79a2b1effb772e04be39e0b85e9826543265de8c..fb1768effb3b4f2dded482bcbc9c6d61ec9b2c3e 100644 (file)
--- 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'])