From: Benjamin Mako Hill Date: Mon, 9 Apr 2012 22:13:42 +0000 (-0400) Subject: merge patched into master X-Git-Url: https://projects.mako.cc/source/python-simplemediawiki.debian/commitdiff_plain/6fb8e7c11cf7aab6efc4b4f961ad460528b8dc16?hp=60777059c8497e3ade4232743bf97590483b7c74 merge patched into master --- diff --git a/debian/.git-dpm b/debian/.git-dpm index 2095053..6a25c22 100644 --- 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 8154aef..a561d6d 100644 --- 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 5c55bcb..b4bb013 100644 --- 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 8a2566b..f484aac 100644 --- 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 0d6c506..9ff6be6 100644 --- 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 008fb9e..9e0d73a 100644 --- 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 09d3a5a..7834548 100644 --- 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 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 +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 4cfcd08..a70b490 100644 --- 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 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'])