Use debian from eobuilder not from debian
This commit is contained in:
parent
a30691f561
commit
bc30b53d0f
|
@ -1,204 +1,5 @@
|
|||
requests (2.0.0-1~bpo70+1) wheezy-backports; urgency=low
|
||||
requests (2.3.0-1~eob70) wheezy-eobuilder; urgency=low
|
||||
|
||||
* Backport to wheezy-backports.
|
||||
* Add myself to Uploaders.
|
||||
* source package automatically created by stdeb 0.7.1
|
||||
|
||||
-- Micah Anderson <micah@debian.org> Tue, 29 Oct 2013 12:00:36 -0400
|
||||
|
||||
requests (2.0.0-1) unstable; urgency=low
|
||||
|
||||
* New upstream release (Closes: #725784)
|
||||
* Switched to pybuild
|
||||
* debian/clean
|
||||
- Switched to debian/clean for cleaning instead of using debian/rules
|
||||
* debian/control
|
||||
- Bumped python(3)-urllib3 to (>=1.7.1)
|
||||
* debian/copyright
|
||||
- Updated copyright year
|
||||
* debian/patches/02_use-system-chardet-and-urllib3.patches
|
||||
- Refreshed
|
||||
* debian/watch
|
||||
- Switched download URL to https
|
||||
|
||||
-- Daniele Tricoli <eriol@mornie.org> Fri, 18 Oct 2013 19:20:21 +0200
|
||||
|
||||
requests (1.2.3-1) unstable; urgency=low
|
||||
|
||||
* New upstream release (Closes: #712915) (LP: #1187429)
|
||||
- Thanks to Scott Moser for the report
|
||||
* debian/compat
|
||||
- Bumped debhelper compatibility level to 9
|
||||
* debian/control
|
||||
- Bumped debhelper B-D to (>= 9)
|
||||
- Temporarily bumped X-Python-Version to >= 2.7 to prevent FTBFS
|
||||
due to lack of python-urllib3 for Python 2.6
|
||||
* debian/patches/02_use-system-chardet-and-urllib3.patches
|
||||
- Refreshed
|
||||
|
||||
-- Daniele Tricoli <eriol@mornie.org> Fri, 21 Jun 2013 08:52:39 +0200
|
||||
|
||||
requests (1.2.0-2) unstable; urgency=low
|
||||
|
||||
* Uploading to unstable.
|
||||
* rm -rf requests.egg-info on clean so the package can be built twice.
|
||||
|
||||
-- Thomas Goirand <zigo@debian.org> Sat, 11 May 2013 05:15:04 +0000
|
||||
|
||||
requests (1.2.0-1) experimental; urgency=low
|
||||
|
||||
* New upstream version.
|
||||
* Refreshed both debian-specific patches.
|
||||
|
||||
-- Thomas Goirand <zigo@debian.org> Thu, 25 Apr 2013 22:56:42 +0000
|
||||
|
||||
requests (1.1.0-1) experimental; urgency=low
|
||||
|
||||
* New upstream release (Closes: #692602)
|
||||
- Thanks to Barry Warsaw for report
|
||||
* debian/control
|
||||
- Added python-chardet, python3-chardet to Build-Depends and moved
|
||||
them from Recommends to Depends since chardet is now required
|
||||
- Added python(3)-urllib3 (>= 1.5) to Build-Depends and Depends
|
||||
since the embedded copy is no more a fork
|
||||
- Removed python(3)-six since python(3)-urllib3 is not embedded
|
||||
anymore
|
||||
- Removed python-gevent and python-oauthlib from Recommends
|
||||
since upstream is not using them anymore
|
||||
- Bumped Standards-Version to 3.9.4 (no changes needed)
|
||||
- Fixed lintian vcs-field-not-canonical
|
||||
* debian/copyright
|
||||
- Updated to reflect upstream switch to Apache 2.0 and updated
|
||||
copyright years
|
||||
* debian/patches/01_do-not-use-python-certifi.patch
|
||||
- Removed because no longer necessary
|
||||
* debian/patches/02_do-not-use-embedded-python-six.patch
|
||||
- Removed because no longer necessary
|
||||
* debian/patches/01_use-system-ca-certificates.patch
|
||||
- Use the bundle provided by ca-certificates instead of
|
||||
the embedded one
|
||||
* debian/patches/02_use-system-chardet-and-urllib3.patches
|
||||
- Use the system python-chardet and python-urllib3 instead of the
|
||||
embedded copies
|
||||
|
||||
-- Daniele Tricoli <eriol@mornie.org> Sun, 20 Jan 2013 23:03:45 +0100
|
||||
|
||||
requests (0.12.1-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
* debian/control
|
||||
- Added python-oauthlib to python-requests' Recommends field
|
||||
* debian/patches/01_do-not-use-python-certifi.patch
|
||||
- Refreshed
|
||||
|
||||
-- Daniele Tricoli <eriol@mornie.org> Fri, 04 May 2012 14:34:47 +0200
|
||||
|
||||
requests (0.11.2-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
* debian/patches/01_do-not-use-python-certifi.patch
|
||||
- Refreshed
|
||||
|
||||
-- Daniele Tricoli <eriol@mornie.org> Mon, 23 Apr 2012 16:06:33 +0200
|
||||
|
||||
requests (0.11.1-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
* debian/control
|
||||
- Added python3-chardet to python3-requests' Recommends field
|
||||
- Updated Description field
|
||||
* debian/patches/02_do-not-use-embedded-python-six.patch
|
||||
- Refreshed
|
||||
|
||||
-- Daniele Tricoli <eriol@mornie.org> Sun, 01 Apr 2012 12:33:42 +0200
|
||||
|
||||
requests (0.10.8-1) unstable; urgency=low
|
||||
|
||||
[ Piotr Ożarowski ]
|
||||
* Fix typo in python3-requests' ${python3:Depends}
|
||||
|
||||
[ Daniele Tricoli ]
|
||||
* New upstream release (Closes: #663561)
|
||||
* Removed embedded copy of python-six
|
||||
- Added debian/patches/02_do-not-use-embedded-python-six.patch
|
||||
- Added override_dh_auto_configure to debian/rules to remove
|
||||
the embedded copy
|
||||
- Added python(3)-six to Builds-Depends and Depends
|
||||
* debian/control
|
||||
- Bumped Standards-Version to 3.9.3 (no changes needed)
|
||||
* debian/copyright
|
||||
- Added forgotten stanzas about packages inside the fork
|
||||
of python-urllib3
|
||||
* debian/patches/01_do-not-use-python-certifi.patch
|
||||
- Refreshed
|
||||
* debian/patches/02_fix-python3-except-sintax-error.patch
|
||||
- Removed as it is applied upstream
|
||||
|
||||
-- Daniele Tricoli <eriol@mornie.org> Mon, 19 Mar 2012 01:20:59 +0100
|
||||
|
||||
requests (0.10.1-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
- Adds Python 3 support
|
||||
* Builded python 3 package
|
||||
* debian/control
|
||||
- Added python-chardet to Recommends
|
||||
- Bumped X-Python-Version >= 2.6
|
||||
- Added ca-certificates to Depends
|
||||
- Added python3-all to Build-Depends
|
||||
* debian/copyright
|
||||
- Updated Format URI
|
||||
- Updated copyright years
|
||||
* debian/patches/01_do-not-use-python-certifi.patch
|
||||
- To verify SSL certificates for HTTPS requests, use the bundle provided by
|
||||
ca-certificates instead of python-certifi
|
||||
* debian/patches/02_fix-python3-except-sintax-error.patches
|
||||
- Fix SyntaxError on Python3 because "except Error, e" is not supported
|
||||
anymore
|
||||
* debian/rules
|
||||
- Added override_dh_auto_clean to make the package build twice in a row
|
||||
|
||||
-- Daniele Tricoli <eriol@mornie.org> Sun, 05 Feb 2012 04:51:38 +0100
|
||||
|
||||
requests (0.8.2-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
* debian/watch
|
||||
- Removed "debian uupdate" options
|
||||
* debian/{copyright,README.source}
|
||||
- Updated to reflect upstream changes: switched from poster to
|
||||
urllib3
|
||||
- Added a stanza about the embedded modified copy of the
|
||||
standard module Cookie
|
||||
|
||||
-- Daniele Tricoli <eriol@mornie.org> Fri, 25 Nov 2011 00:02:28 +0100
|
||||
|
||||
requests (0.6.4-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
* debian/control
|
||||
- Dropped python-eventlet from Depends field because it's not used
|
||||
anymore
|
||||
- Moved python-gevent from Depends field to Recommends field so
|
||||
python-requests can be installed also in ia64 and sparc
|
||||
|
||||
-- Daniele Tricoli <eriol@mornie.org> Wed, 19 Oct 2011 20:49:39 +0200
|
||||
|
||||
requests (0.6.1-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
|
||||
-- Daniele Tricoli <eriol@mornie.org> Tue, 23 Aug 2011 02:00:41 +0200
|
||||
|
||||
requests (0.5.0-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
* debian/control
|
||||
- Updated description to mention proxy support
|
||||
|
||||
-- Daniele Tricoli <eriol@mornie.org> Sun, 26 Jun 2011 07:12:03 +0200
|
||||
|
||||
requests (0.4.1-1) unstable; urgency=low
|
||||
|
||||
* Initial release (Closes: #629370)
|
||||
|
||||
-- Daniele Tricoli <eriol@mornie.org> Mon, 06 Jun 2011 02:11:15 +0200
|
||||
-- Kenneth Reitz <me@kennethreitz.com> Tue, 27 May 2014 10:29:29 +0200
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
requests.egg-info/*
|
|
@ -1 +1 @@
|
|||
9
|
||||
7
|
||||
|
|
|
@ -1,77 +1,31 @@
|
|||
Source: requests
|
||||
Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
|
||||
Uploaders: Daniele Tricoli <eriol@mornie.org>,
|
||||
Micah Anderson <micah@debian.org>
|
||||
Maintainer: Kenneth Reitz <me@kennethreitz.com>
|
||||
Section: python
|
||||
Priority: optional
|
||||
Build-Depends:
|
||||
debhelper (>= 9),
|
||||
dh-python,
|
||||
python-all (>= 2.6.6-3),
|
||||
python-chardet,
|
||||
python-urllib3 (>= 1.7.1),
|
||||
python3-all,
|
||||
python3-chardet,
|
||||
python3-urllib3 (>= 1.7.1)
|
||||
Standards-Version: 3.9.4
|
||||
X-Python-Version: >= 2.7
|
||||
X-Python3-Version: >= 3.0
|
||||
Homepage: http://python-requests.org
|
||||
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/requests/trunk/
|
||||
Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/requests/trunk/
|
||||
Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 7)
|
||||
Standards-Version: 3.9.1
|
||||
|
||||
Package: python-requests
|
||||
Architecture: all
|
||||
Depends:
|
||||
${misc:Depends},
|
||||
${python:Depends},
|
||||
ca-certificates,
|
||||
python-chardet,
|
||||
python-urllib3 (>= 1.7.1),
|
||||
Description: elegant and simple HTTP library for Python, built for human beings
|
||||
Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
|
||||
multipart files, and parameters with simple Python dictionaries, and access the
|
||||
response data in the same way. It's powered by httplib and urllib3, but it does
|
||||
all the hard work and crazy hacks for you.
|
||||
Depends: ${misc:Depends}, ${python:Depends}
|
||||
Description: Python HTTP for Humans.
|
||||
Requests: HTTP for Humans
|
||||
=========================
|
||||
.
|
||||
Features
|
||||
.. image:: https://badge.fury.io/py/requests.png
|
||||
:target: http://badge.fury.io/py/requests
|
||||
.
|
||||
- International Domains and URLs
|
||||
- Keep-Alive & Connection Pooling
|
||||
- Sessions with Cookie Persistence
|
||||
- Browser-style SSL Verification
|
||||
- Basic/Digest Authentication
|
||||
- Elegant Key/Value Cookies
|
||||
- Automatic Decompression
|
||||
- Unicode Response Bodies
|
||||
- Multipart File Uploads
|
||||
- Connection Timeouts
|
||||
|
||||
Package: python3-requests
|
||||
Architecture: all
|
||||
Depends:
|
||||
${misc:Depends},
|
||||
${python3:Depends},
|
||||
ca-certificates,
|
||||
python3-chardet,
|
||||
python3-urllib3 (>= 1.5)
|
||||
Description: elegant and simple HTTP library for Python3, built for human beings
|
||||
Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
|
||||
multipart files, and parameters with simple Python dictionaries, and access the
|
||||
response data in the same way. It's powered by httplib and urllib3, but it does
|
||||
all the hard work and crazy hacks for you.
|
||||
.. image:: https://pypip.in/d/requests/badge.png
|
||||
:target: https://crate.io/packages/requests/
|
||||
.
|
||||
Features
|
||||
.
|
||||
- International Domains and URLs
|
||||
- Keep-Alive & Connection Pooling
|
||||
- Sessions with Cookie Persistence
|
||||
- Browser-style SSL Verification
|
||||
- Basic/Digest Authentication
|
||||
- Elegant Key/Value Cookies
|
||||
- Automatic Decompression
|
||||
- Unicode Response Bodies
|
||||
- Multipart File Uploads
|
||||
- Connection Timeouts
|
||||
Requests is an Apache2 Licensed HTTP library, written in Python, for human
|
||||
beings.
|
||||
.
|
||||
This package contains the Python 3 version of the library.
|
||||
Most existing Python modules for sending HTTP requests are extremely
|
||||
verbose and cumbersome. Python's builtin urllib2 module provides most of
|
||||
the HTTP capabilities you should need, but the api is thoroughly broken.
|
||||
It requires an enormous amount of work (even method overrides) to
|
||||
perform the simplest of tasks.
|
||||
.
|
||||
Things shouldn't be this way. Not in Python.
|
||||
|
|
|
@ -1,127 +0,0 @@
|
|||
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: requests
|
||||
Upstream-Contact: Kenneth Reitz <me@kennethreitz.com>
|
||||
Source: http://pypi.python.org/pypi/requests
|
||||
|
||||
Files: *
|
||||
Copyright: 2011-2013, Kenneth Reitz
|
||||
License: Apache
|
||||
|
||||
Files: requests/packages/urllib3/*
|
||||
Copyright: 2008-2013, Andrey Petrov
|
||||
License: Expat
|
||||
|
||||
Files: requests/packages/urllib3/packages/ordered_dict.py
|
||||
Copyright: 2009, Raymond Hettinger
|
||||
License: Expat
|
||||
|
||||
Files: requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
|
||||
Copyright: 2011, Python Software Foundation
|
||||
License: PSF-2
|
||||
|
||||
Files: requests/packages/urllib3/packages/six.py
|
||||
Copyright: 2010-2011, Benjamin Peterson
|
||||
License: Expat
|
||||
|
||||
Files: requests/packages/charade/*
|
||||
Copyright: 2006-2008, Mark Pilgrim
|
||||
2012-2013, Ian Cordasco
|
||||
License: LGPL-2.1+
|
||||
|
||||
Files: requests/cacert.pem
|
||||
Copyright: 2013, Mozilla
|
||||
License: LGPL-2.1+
|
||||
|
||||
Files: debian/*
|
||||
Copyright: 2011-2013, Daniele Tricoli <eriol@mornie.org>
|
||||
License: Apache
|
||||
|
||||
License: Apache
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this software except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
.
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
.
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
.
|
||||
On Debian systems, the full text of the Apache License, Version 2.0 can be
|
||||
found in the file `/usr/share/common-licenses/Apache-2.0'.
|
||||
|
||||
License: Expat
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of this software and associated documentation files (the
|
||||
"Software"), to deal in the Software without restriction, including
|
||||
without limitation the rights to use, copy, modify, merge, publish,
|
||||
distribute, sublicense, and/or sell copies of the Software, and to
|
||||
permit persons to whom the Software is furnished to do so, subject to
|
||||
the following conditions:
|
||||
.
|
||||
The above copyright notice and this permission notice shall be included
|
||||
in all copies or substantial portions of the Software.
|
||||
.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
||||
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
||||
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
License: PSF-2
|
||||
1. This LICENSE AGREEMENT is between the Python Software Foundation
|
||||
("PSF"), and the Individual or Organization ("Licensee") accessing
|
||||
and otherwise using this software ("Python") in source or binary form
|
||||
and its associated documentation.
|
||||
.
|
||||
2. Subject to the terms and conditions of this License Agreement, PSF
|
||||
hereby grants Licensee a nonexclusive, royalty-free, world-wide
|
||||
license to reproduce, analyze, test, perform and/or display publicly,
|
||||
prepare derivative works, distribute, and otherwise use Python alone
|
||||
or in any derivative version, provided, however, that PSF's License
|
||||
Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001,
|
||||
2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
|
||||
Reserved" are retained in Python alone or in any derivative version
|
||||
prepared by Licensee.
|
||||
.
|
||||
3. In the event Licensee prepares a derivative work that is based on
|
||||
or incorporates Python or any part thereof, and wants to make the
|
||||
derivative work available to others as provided herein, then Licensee
|
||||
hereby agrees to include in any such work a brief summary of the
|
||||
changes made to Python.
|
||||
.
|
||||
4. PSF is making Python available to Licensee on an "AS IS"
|
||||
basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
|
||||
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
|
||||
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR
|
||||
FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
|
||||
INFRINGE ANY THIRD PARTY RIGHTS.
|
||||
.
|
||||
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
|
||||
FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
|
||||
RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY
|
||||
DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
|
||||
.
|
||||
6. This License Agreement will automatically terminate upon a
|
||||
material breach of its terms and conditions.
|
||||
.
|
||||
7. Nothing in this License Agreement shall be deemed to create any
|
||||
relationship of agency, partnership, or joint venture between PSF and
|
||||
Licensee. This License Agreement does not grant permission to use PSF
|
||||
trademarks or trade name in a trademark sense to endorse or promote
|
||||
products or services of Licensee, or any third party.
|
||||
.
|
||||
8. By copying, installing or otherwise using Python, Licensee agrees
|
||||
to be bound by the terms and conditions of this License Agreement.
|
||||
|
||||
License: LGPL-2.1+
|
||||
This library is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as
|
||||
published by the Free Software Foundation; either version 2.1 of the
|
||||
License, or (at your option) any later version.
|
||||
.
|
||||
See /usr/share/common-licenses/LGPL-2.1 for the full license text.
|
|
@ -1 +0,0 @@
|
|||
README.rst
|
|
@ -1,28 +0,0 @@
|
|||
Description: Use the bundle provided by ca-certificates instead of
|
||||
the embedded one.
|
||||
Author: Daniele Tricoli <eriol@mornie.org>
|
||||
Forwarded: not-needed
|
||||
Last-Update: 2013-01-19
|
||||
|
||||
--- a/requests/certs.py 2013-04-25 22:54:02.000000000 +0000
|
||||
+++ b/requests/certs.py 2013-04-25 22:54:34.000000000 +0000
|
||||
@@ -18,7 +18,7 @@
|
||||
def where():
|
||||
"""Return the preferred certificate bundle."""
|
||||
# vendored bundle inside Requests
|
||||
- return os.path.join(os.path.dirname(__file__), 'cacert.pem')
|
||||
+ return '/etc/ssl/certs/ca-certificates.crt'
|
||||
|
||||
if __name__ == '__main__':
|
||||
print(where())
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -35,7 +35,7 @@
|
||||
author_email='me@kennethreitz.com',
|
||||
url='http://python-requests.org',
|
||||
packages=packages,
|
||||
- package_data={'': ['LICENSE', 'NOTICE'], 'requests': ['*.pem']},
|
||||
+ package_data={'': ['LICENSE', 'NOTICE'],},
|
||||
package_dir={'requests': 'requests'},
|
||||
include_package_data=True,
|
||||
install_requires=requires,
|
|
@ -1,81 +0,0 @@
|
|||
Description: Use the system python-chardet and python-urllib3 instead of the
|
||||
embedded copies.
|
||||
Author: Daniele Tricoli <eriol@mornie.org>
|
||||
Forwarded: not-needed
|
||||
Last-Update: 2013-10-17
|
||||
|
||||
--- a/requests/adapters.py
|
||||
+++ b/requests/adapters.py
|
||||
@@ -11,17 +11,17 @@
|
||||
import socket
|
||||
|
||||
from .models import Response
|
||||
-from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
|
||||
-from .packages.urllib3.response import HTTPResponse
|
||||
-from .packages.urllib3.util import Timeout as TimeoutSauce
|
||||
+from urllib3.poolmanager import PoolManager, proxy_from_url
|
||||
+from urllib3.response import HTTPResponse
|
||||
+from urllib3.util import Timeout as TimeoutSauce
|
||||
from .compat import urlparse, basestring, urldefrag, unquote
|
||||
from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
|
||||
except_on_missing_scheme, get_auth_from_url)
|
||||
from .structures import CaseInsensitiveDict
|
||||
-from .packages.urllib3.exceptions import MaxRetryError
|
||||
-from .packages.urllib3.exceptions import TimeoutError
|
||||
-from .packages.urllib3.exceptions import SSLError as _SSLError
|
||||
-from .packages.urllib3.exceptions import HTTPError as _HTTPError
|
||||
+from urllib3.exceptions import MaxRetryError
|
||||
+from urllib3.exceptions import TimeoutError
|
||||
+from urllib3.exceptions import SSLError as _SSLError
|
||||
+from urllib3.exceptions import HTTPError as _HTTPError
|
||||
from .cookies import extract_cookies_to_jar
|
||||
from .exceptions import ConnectionError, Timeout, SSLError
|
||||
from .auth import _basic_auth_str
|
||||
--- a/requests/compat.py
|
||||
+++ b/requests/compat.py
|
||||
@@ -4,7 +4,7 @@
|
||||
pythoncompat
|
||||
"""
|
||||
|
||||
-from .packages import charade as chardet
|
||||
+import chardet
|
||||
|
||||
import sys
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
import cookielib
|
||||
from Cookie import Morsel
|
||||
from StringIO import StringIO
|
||||
- from .packages.urllib3.packages.ordered_dict import OrderedDict
|
||||
+ from urllib3.packages.ordered_dict import OrderedDict
|
||||
from httplib import IncompleteRead
|
||||
|
||||
builtin_str = str
|
||||
--- a/requests/models.py
|
||||
+++ b/requests/models.py
|
||||
@@ -17,8 +17,8 @@
|
||||
|
||||
from .auth import HTTPBasicAuth
|
||||
from .cookies import cookiejar_from_dict, get_cookie_header
|
||||
-from .packages.urllib3.filepost import encode_multipart_formdata
|
||||
-from .packages.urllib3.util import parse_url
|
||||
+from urllib3.filepost import encode_multipart_formdata
|
||||
+from urllib3.util import parse_url
|
||||
from .exceptions import (
|
||||
HTTPError, RequestException, MissingSchema, InvalidURL,
|
||||
ChunkedEncodingError)
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -16,12 +16,6 @@
|
||||
|
||||
packages = [
|
||||
'requests',
|
||||
- 'requests.packages',
|
||||
- 'requests.packages.charade',
|
||||
- 'requests.packages.urllib3',
|
||||
- 'requests.packages.urllib3.packages',
|
||||
- 'requests.packages.urllib3.contrib',
|
||||
- 'requests.packages.urllib3.packages.ssl_match_hostname'
|
||||
]
|
||||
|
||||
requires = []
|
|
@ -1,2 +0,0 @@
|
|||
01_use-system-ca-certificates.patch
|
||||
02_use-system-chardet-and-urllib3.patch
|
|
@ -1,11 +1,9 @@
|
|||
#!/usr/bin/make -f
|
||||
|
||||
export PYBUILD_DESTDIR_python2=debian/python-requests/
|
||||
export PYBUILD_DESTDIR_python3=debian/python3-requests/
|
||||
|
||||
# This file was automatically generated by stdeb 0.7.1 at
|
||||
# Tue, 27 May 2014 10:29:29 +0200
|
||||
|
||||
%:
|
||||
dh $@ --with python2,python3 --buildsystem=pybuild
|
||||
dh $@ --with python2 --buildsystem=python_distutils
|
||||
|
||||
|
||||
override_dh_installchangelogs:
|
||||
dh_installchangelogs HISTORY.rst
|
||||
|
|
|
@ -1 +1 @@
|
|||
3.0 (quilt)
|
||||
1.0
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
version=3
|
||||
https://pypi.python.org/packages/source/r/requests/requests-(.*)\.tar\.gz
|
Loading…
Reference in New Issue