diff options
-rw-r--r-- | debian/changelog | 341 | ||||
-rw-r--r-- | debian/clean | 1 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/control | 115 | ||||
-rw-r--r-- | debian/copyright | 502 | ||||
-rw-r--r-- | debian/docs | 1 | ||||
-rw-r--r-- | debian/patches/01_use-system-ca-certificates.patch | 35 | ||||
-rw-r--r-- | debian/patches/02_use-system-chardet-and-urllib3.patch | 129 | ||||
-rw-r--r-- | debian/patches/03_export-IncompleteRead.patch | 25 | ||||
-rw-r--r-- | debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch | 46 | ||||
-rw-r--r-- | debian/patches/series | 4 | ||||
-rw-r--r-- | debian/python-requests-whl.install | 1 | ||||
-rwxr-xr-x | debian/rules | 30 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/watch | 3 |
15 files changed, 1235 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..f5f80d5 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,341 @@ +requests (2.7.0-1) experimental; urgency=medium + + * New upstream release. (Closes: #784095) + - Embedded copy (not used) of urllib3 does not require SSLv3 anymore. + (Closes: #770172) + * debian/control + - Move python-ndg-httpsclient, python-openssl and python-pyasn1 to Suggests + inside python-requests' stanza since Python 2.7.9 include SNI support + and PEP 476 made it as secure as Python 3. + - Bump python{,3}-urllib3 to 1.10.4. + * debian/copyright + - Update copyright years. + - Update to MPL-2.0 license stanza of requests/cacert.pem (not used but + shipped in orig tarball). + * debian/watch + - Use pypi.debian.net redirector. + * debian/patches/01_use-system-ca-certificates.patch + - Refresh and remove CA certificate bundle from MANIFEST.in. + (Closes: #781610) + * debian/patches/02_use-system-chardet-and-urllib3.patch + - Refresh. + * debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch + - Refresh. + * debian/patches/05_do-not-ascribe-cookies-to-the-target-domain.patch + - Remove since fixed upstream. + * debian/python{,3}-requests.links + - Remove links thanks to the import machinery in + 04_make-requests.packages.urllib3-same-as-urllib3.patch + + -- Daniele Tricoli <eriol@mornie.org> Mon, 04 May 2015 21:43:40 +0200 + +requests (2.4.3-6) unstable; urgency=medium + + * debian/patches/05_do-not-ascribe-cookies-to-the-target-domain.patch + - Fix session fixation and cookie stealing: CVE-2015-2296. + (Closes: #780506) + + -- Daniele Tricoli <eriol@mornie.org> Mon, 16 Mar 2015 01:31:10 +0100 + +requests (2.4.3-5) unstable; urgency=medium + + * Team upload. + * d/control: Remove the Build-Depends on python{,3}-pytest since we + aren't actually running the tests at build time. (Closes: #770173) + * d/rules: Update the comment about why the tests are currently disabled + at build time to point to the updated upstream url. + + -- Barry Warsaw <barry@debian.org> Wed, 19 Nov 2014 18:00:46 -0500 + +requests (2.4.3-4) unstable; urgency=medium + + * debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch + - Fix requests.packages.urllib3 sub on Python 3. Thanks to Tianon + Gravi for the report. (Closes: #769496) + + -- Daniele Tricoli <eriol@mornie.org> Fri, 14 Nov 2014 04:50:22 +0100 + +requests (2.4.3-3) unstable; urgency=medium + + * debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch + - Make Python import system know that requests.packages.urllib3 and + urllib3 are the same thing. Thanks to Jakub Wilk for the patch. + (Closes: #769047) + + -- Daniele Tricoli <eriol@mornie.org> Tue, 11 Nov 2014 03:28:18 +0100 + +requests (2.4.3-2) unstable; urgency=medium + + * debian/patches/03_export-IncompleteRead.patch + - Export IncompleteRead from requests.compat since it's imported by + python-pip. (Closes: #766419) + + -- Daniele Tricoli <eriol@mornie.org> Thu, 23 Oct 2014 02:54:46 +0200 + +requests (2.4.3-1) unstable; urgency=medium + + * New upstream release. + * debian/control + - Fix duplicate-short-description. + - Bump Standards-Version to 3.9.6 (no changes needed). + - Add python-ndg-httpsclient, python-openssl and python-pyasn1 into + python-urllib3's Recomends to ensure that SNI works as expected and to + prevent CRIME attack. (Closes: #755805) + - Add python3-ndg-httpsclient, python3-openssl and python3-pyasn1 into + python3-urllib3's Suggests since Python 3 already support SNI and + and SSL compression can be disabled using OP_NO_COMPRESSION. + - Bump python{,3}-urllib3 to (>=1.9.1). + * debian/patches/01_use-system-ca-certificates.patch + - Refresh. + * debian/patches/02_use-system-chardet-and-urllib3.patch + - Refresh. + - Provide requests.packages package because it will be used to supply + a stub for requests.packages.urllib3. + * debian/python{,3}-requests.links: + - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3 + system package since it is used as import location. (Closes: #753578) + + -- Daniele Tricoli <eriol@mornie.org> Tue, 21 Oct 2014 01:35:59 +0200 + +requests (2.3.0-1) unstable; urgency=medium + + * Team upload. + - Fix CVE-2014-1829 and CVE-2014-1830 (Closes: #733108) + * New upstream release. + * d/control: Added python{,3}-pytest to Build-Depends. + * d/patches/*: Refreshed. + + -- Barry Warsaw <barry@debian.org> Wed, 04 Jun 2014 10:40:46 -0400 + +requests (2.2.1-3) unstable; urgency=medium + + * Team upload. + * d/control: + - Fix python-requests-whl Depends. + - Fix typo in python-requests-whl description. + + -- Barry Warsaw <barry@debian.org> Thu, 22 May 2014 18:33:19 -0400 + +requests (2.2.1-2) unstable; urgency=medium + + * Team upload. + * debian/control + - Add python-requests-whl binary package. + - Build-Depends on python3-wheel, python-setuptools, + and python3-setuptools. + - wrap-and-sort. + * debian/rules: + - Simplify by using PYBUILD_NAME. + - Build the universal wheels. + + -- Barry Warsaw <barry@debian.org> Thu, 15 May 2014 17:09:30 -0400 + +requests (2.2.1-1) unstable; urgency=medium + + * New upstream release + * debian/control + - Bumped Standards-Version to 3.9.5 (no changes needed) + * debian/copyright + - Updated copyright years + * debian/patches/02_use-system-chardet-and-urllib3.patches + - Refreshed + + -- Daniele Tricoli <eriol@mornie.org> Mon, 27 Jan 2014 04:58:17 +0100 + +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 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..6b4c10a --- /dev/null +++ b/debian/clean @@ -0,0 +1 @@ +requests.egg-info/* diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..a6b2d11 --- /dev/null +++ b/debian/control @@ -0,0 +1,115 @@ +Source: requests +Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> +Uploaders: Daniele Tricoli <eriol@mornie.org> +Section: python +Priority: optional +Build-Depends: + debhelper (>= 9), + dh-python, + python-all (>= 2.6.6-3), + python-chardet, + python-setuptools, + python-urllib3 (>= 1.10.4), + python3-all, + python3-chardet, + python3-setuptools, + python3-urllib3 (>= 1.10.4), + python3-wheel +Standards-Version: 3.9.6 +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/ + +Package: python-requests +Architecture: all +Depends: + ${misc:Depends}, + ${python:Depends}, + ca-certificates, + python-chardet, + python-urllib3 (>= 1.10.4) +Suggests: + python-ndg-httpsclient, + python-openssl, + python-pyasn1 +Description: elegant and simple HTTP library for Python2, 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. + . + 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 + +Package: python3-requests +Architecture: all +Depends: + ${misc:Depends}, + ${python3:Depends}, + ca-certificates, + python3-chardet, + python3-urllib3 (>= 1.10.4) +Suggests: + python3-ndg-httpsclient, + python3-openssl, + python3-pyasn1 +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. + . + 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 + . + This package contains the Python 3 version of the library. + +Package: python-requests-whl +Architecture: all +Depends: + ${misc:Depends}, + ${python3:Depends}, + ca-certificates, + python-urllib3-whl +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. + . + 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 + . + This package provides the universal wheel. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..4629601 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,502 @@ +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: 2015, 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/chardet/* +Copyright: 2006-2008, Mark Pilgrim + 2012-2013, Ian Cordasco +License: LGPL-2.1+ + +Files: requests/cacert.pem +Copyright: 2013, Mozilla +License: MPL-2.0 + +Files: debian/* +Copyright: 2011-2015, 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. + +License: MPL-2.0 + Mozilla Public License Version 2.0 + ================================== + . + 1. Definitions + -------------- + . + 1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + . + 1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + . + 1.3. "Contribution" + means Covered Software of a particular Contributor. + . + 1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + . + 1.5. "Incompatible With Secondary Licenses" + means + . + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + . + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + . + 1.6. "Executable Form" + means any form of the work other than Source Code Form. + . + 1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + . + 1.8. "License" + means this document. + . + 1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + . + 1.10. "Modifications" + means any of the following: + . + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + . + (b) any new file in Source Code Form that contains any Covered + Software. + . + 1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + . + 1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + . + 1.13. "Source Code Form" + means the form of the work preferred for making modifications. + . + 1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + . + 2. License Grants and Conditions + -------------------------------- + . + 2.1. Grants + . + Each Contributor hereby grants You a world-wide, royalty-free, + non-exclusive license: + . + (a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + . + (b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + . + 2.2. Effective Date + . + The licenses granted in Section 2.1 with respect to any Contribution + become effective for each Contribution on the date the Contributor first + distributes such Contribution. + . + 2.3. Limitations on Grant Scope + . + The licenses granted in this Section 2 are the only rights granted under + this License. No additional rights or licenses will be implied from the + distribution or licensing of Covered Software under this License. + Notwithstanding Section 2.1(b) above, no patent license is granted by a + Contributor: + . + (a) for any code that a Contributor has removed from Covered Software; + or + . + (b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + . + (c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + . + This License does not grant any rights in the trademarks, service marks, + or logos of any Contributor (except as may be necessary to comply with + the notice requirements in Section 3.4). + . + 2.4. Subsequent Licenses + . + No Contributor makes additional grants as a result of Your choice to + distribute the Covered Software under a subsequent version of this + License (see Section 10.2) or under the terms of a Secondary License (if + permitted under the terms of Section 3.3). + . + 2.5. Representation + . + Each Contributor represents that the Contributor believes its + Contributions are its original creation(s) or it has sufficient rights + to grant the rights to its Contributions conveyed by this License. + . + 2.6. Fair Use + . + This License is not intended to limit any rights You have under + applicable copyright doctrines of fair use, fair dealing, or other + equivalents. + . + 2.7. Conditions + . + Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted + in Section 2.1. + . + 3. Responsibilities + ------------------- + . + 3.1. Distribution of Source Form + . + All distribution of Covered Software in Source Code Form, including any + Modifications that You create or to which You contribute, must be under + the terms of this License. You must inform recipients that the Source + Code Form of the Covered Software is governed by the terms of this + License, and how they can obtain a copy of this License. You may not + attempt to alter or restrict the recipients' rights in the Source Code + Form. + . + 3.2. Distribution of Executable Form + . + If You distribute Covered Software in Executable Form then: + . + (a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + . + (b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + . + 3.3. Distribution of a Larger Work + . + You may create and distribute a Larger Work under terms of Your choice, + provided that You also comply with the requirements of this License for + the Covered Software. If the Larger Work is a combination of Covered + Software with a work governed by one or more Secondary Licenses, and the + Covered Software is not Incompatible With Secondary Licenses, this + License permits You to additionally distribute such Covered Software + under the terms of such Secondary License(s), so that the recipient of + the Larger Work may, at their option, further distribute the Covered + Software under the terms of either this License or such Secondary + License(s). + . + 3.4. Notices + . + You may not remove or alter the substance of any license notices + (including copyright notices, patent notices, disclaimers of warranty, + or limitations of liability) contained within the Source Code Form of + the Covered Software, except that You may alter any license notices to + the extent required to remedy known factual inaccuracies. + . + 3.5. Application of Additional Terms + . + You may choose to offer, and to charge a fee for, warranty, support, + indemnity or liability obligations to one or more recipients of Covered + Software. However, You may do so only on Your own behalf, and not on + behalf of any Contributor. You must make it absolutely clear that any + such warranty, support, indemnity, or liability obligation is offered by + You alone, and You hereby agree to indemnify every Contributor for any + liability incurred by such Contributor as a result of warranty, support, + indemnity or liability terms You offer. You may include additional + disclaimers of warranty and limitations of liability specific to any + jurisdiction. + . + 4. Inability to Comply Due to Statute or Regulation + --------------------------------------------------- + . + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Software due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description must + be placed in a text file included with all distributions of the Covered + Software under this License. Except to the extent prohibited by statute + or regulation, such description must be sufficiently detailed for a + recipient of ordinary skill to be able to understand it. + . + 5. Termination + -------------- + . + 5.1. The rights granted under this License will terminate automatically + if You fail to comply with any of its terms. However, if You become + compliant, then the rights granted under this License from a particular + Contributor are reinstated (a) provisionally, unless and until such + Contributor explicitly and finally terminates Your grants, and (b) on an + ongoing basis, if such Contributor fails to notify You of the + non-compliance by some reasonable means prior to 60 days after You have + come back into compliance. Moreover, Your grants from a particular + Contributor are reinstated on an ongoing basis if such Contributor + notifies You of the non-compliance by some reasonable means, this is the + first time You have received notice of non-compliance with this License + from such Contributor, and You become compliant prior to 30 days after + Your receipt of the notice. + . + 5.2. If You initiate litigation against any entity by asserting a patent + infringement claim (excluding declaratory judgment actions, + counter-claims, and cross-claims) alleging that a Contributor Version + directly or indirectly infringes any patent, then the rights granted to + You by any and all Contributors for the Covered Software under Section + 2.1 of this License shall terminate. + . + 5.3. In the event of termination under Sections 5.1 or 5.2 above, all + end user license agreements (excluding distributors and resellers) which + have been validly granted by You or Your distributors under this License + prior to termination shall survive termination. + . + ************************************************************************ + * * + * 6. Disclaimer of Warranty * + * ------------------------- * + * * + * Covered Software is provided under this License on an "as is" * + * basis, without warranty of any kind, either expressed, implied, or * + * statutory, including, without limitation, warranties that the * + * Covered Software is free of defects, merchantable, fit for a * + * particular purpose or non-infringing. The entire risk as to the * + * quality and performance of the Covered Software is with You. * + * Should any Covered Software prove defective in any respect, You * + * (not any Contributor) assume the cost of any necessary servicing, * + * repair, or correction. This disclaimer of warranty constitutes an * + * essential part of this License. No use of any Covered Software is * + * authorized under this License except under this disclaimer. * + * * + ************************************************************************ + . + ************************************************************************ + * * + * 7. Limitation of Liability * + * -------------------------- * + * * + * Under no circumstances and under no legal theory, whether tort * + * (including negligence), contract, or otherwise, shall any * + * Contributor, or anyone who distributes Covered Software as * + * permitted above, be liable to You for any direct, indirect, * + * special, incidental, or consequential damages of any character * + * including, without limitation, damages for lost profits, loss of * + * goodwill, work stoppage, computer failure or malfunction, or any * + * and all other commercial damages or losses, even if such party * + * shall have been informed of the possibility of such damages. This * + * limitation of liability shall not apply to liability for death or * + * personal injury resulting from such party's negligence to the * + * extent applicable law prohibits such limitation. Some * + * jurisdictions do not allow the exclusion or limitation of * + * incidental or consequential damages, so this exclusion and * + * limitation may not apply to You. * + * * + ************************************************************************ + . + 8. Litigation + ------------- + . + Any litigation relating to this License may be brought only in the + courts of a jurisdiction where the defendant maintains its principal + place of business and such litigation shall be governed by laws of that + jurisdiction, without reference to its conflict-of-law provisions. + Nothing in this Section shall prevent a party's ability to bring + cross-claims or counter-claims. + . + 9. Miscellaneous + ---------------- + . + This License represents the complete agreement concerning the subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. Any law or regulation which provides + that the language of a contract shall be construed against the drafter + shall not be used to construe this License against a Contributor. + . + 10. Versions of the License + --------------------------- + . + 10.1. New Versions + . + Mozilla Foundation is the license steward. Except as provided in Section + 10.3, no one other than the license steward has the right to modify or + publish new versions of this License. Each version will be given a + distinguishing version number. + . + 10.2. Effect of New Versions + . + You may distribute the Covered Software under the terms of the version + of the License under which You originally received the Covered Software, + or under the terms of any subsequent version published by the license + steward. + . + 10.3. Modified Versions + . + If you create software not governed by this License, and you want to + create a new license for such software, you may create and use a + modified version of this License if you rename the license and remove + any references to the name of the license steward (except to note that + such modified license differs from this License). + . + 10.4. Distributing Source Code Form that is Incompatible With Secondary + Licenses + . + If You choose to distribute Source Code Form that is Incompatible With + Secondary Licenses under the terms of this version of the License, the + notice described in Exhibit B of this License must be attached. + . + Exhibit A - Source Code Form License Notice + ------------------------------------------- + . + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + . + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to look + for such a notice. + . + You may add additional accurate notices of copyright ownership. + . + Exhibit B - "Incompatible With Secondary Licenses" Notice + --------------------------------------------------------- + . + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..a1320b1 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.rst diff --git a/debian/patches/01_use-system-ca-certificates.patch b/debian/patches/01_use-system-ca-certificates.patch new file mode 100644 index 0000000..b5cfeec --- /dev/null +++ b/debian/patches/01_use-system-ca-certificates.patch @@ -0,0 +1,35 @@ +Description: Use the bundle provided by ca-certificates instead of + the embedded one. +Author: Daniele Tricoli <eriol@mornie.org> +Forwarded: not-needed +Last-Update: 2014-10-08 + +--- a/requests/certs.py ++++ b/requests/certs.py +@@ -18,8 +18,8 @@ + except ImportError: + def where(): + """Return the preferred certificate bundle.""" +- # vendored bundle inside Requests +- return os.path.join(os.path.dirname(__file__), 'cacert.pem') ++ # On Debian systems use ca-certificates ++ return '/etc/ssl/certs/ca-certificates.crt' + + if __name__ == '__main__': + print(where()) +--- a/setup.py ++++ b/setup.py +@@ -50,7 +50,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, +--- a/MANIFEST.in ++++ b/MANIFEST.in +@@ -1 +1 @@ +-include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt requests/cacert.pem ++include README.rst LICENSE NOTICE HISTORY.rst test_requests.py requirements.txt diff --git a/debian/patches/02_use-system-chardet-and-urllib3.patch b/debian/patches/02_use-system-chardet-and-urllib3.patch new file mode 100644 index 0000000..956ffb8 --- /dev/null +++ b/debian/patches/02_use-system-chardet-and-urllib3.patch @@ -0,0 +1,129 @@ +Description: Use the system python-chardet and python-urllib3 instead of the + embedded copies but provide requests.packages package because it will be + used to supply a stub for ``requests.packages.urllib3``. +Author: Daniele Tricoli <eriol@mornie.org> +Forwarded: not-needed +Last-Update: 2015-05-04 + +--- a/requests/adapters.py ++++ b/requests/adapters.py +@@ -11,22 +11,22 @@ + 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 .packages.urllib3.util.retry import Retry ++from urllib3.poolmanager import PoolManager, proxy_from_url ++from urllib3.response import HTTPResponse ++from urllib3.util import Timeout as TimeoutSauce ++from urllib3.util.retry import Retry + from .compat import urlparse, basestring + from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, + prepend_scheme_if_needed, get_auth_from_url, urldefragauth) + from .structures import CaseInsensitiveDict +-from .packages.urllib3.exceptions import ConnectTimeoutError +-from .packages.urllib3.exceptions import HTTPError as _HTTPError +-from .packages.urllib3.exceptions import MaxRetryError +-from .packages.urllib3.exceptions import ProxyError as _ProxyError +-from .packages.urllib3.exceptions import ProtocolError +-from .packages.urllib3.exceptions import ReadTimeoutError +-from .packages.urllib3.exceptions import SSLError as _SSLError +-from .packages.urllib3.exceptions import ResponseError ++from urllib3.exceptions import ConnectTimeoutError ++from urllib3.exceptions import HTTPError as _HTTPError ++from urllib3.exceptions import MaxRetryError ++from urllib3.exceptions import ProxyError as _ProxyError ++from urllib3.exceptions import ProtocolError ++from urllib3.exceptions import ReadTimeoutError ++from urllib3.exceptions import SSLError as _SSLError ++from urllib3.exceptions import ResponseError + from .cookies import extract_cookies_to_jar + from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError, + ProxyError, RetryError) +--- a/requests/compat.py ++++ b/requests/compat.py +@@ -4,7 +4,7 @@ + pythoncompat + """ + +-from .packages import chardet ++import chardet + + import sys + +@@ -39,7 +39,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 + + builtin_str = str + bytes = str +--- a/requests/models.py ++++ b/requests/models.py +@@ -16,10 +16,10 @@ + + from .auth import HTTPBasicAuth + from .cookies import cookiejar_from_dict, get_cookie_header, _copy_cookie_jar +-from .packages.urllib3.fields import RequestField +-from .packages.urllib3.filepost import encode_multipart_formdata +-from .packages.urllib3.util import parse_url +-from .packages.urllib3.exceptions import ( ++from urllib3.fields import RequestField ++from urllib3.filepost import encode_multipart_formdata ++from urllib3.util import parse_url ++from urllib3.exceptions import ( + DecodeError, ReadTimeoutError, ProtocolError, LocationParseError) + from .exceptions import ( + HTTPError, MissingSchema, InvalidURL, ChunkedEncodingError, +--- a/setup.py ++++ b/setup.py +@@ -18,12 +18,6 @@ + packages = [ + 'requests', + 'requests.packages', +- 'requests.packages.chardet', +- 'requests.packages.urllib3', +- 'requests.packages.urllib3.packages', +- 'requests.packages.urllib3.contrib', +- 'requests.packages.urllib3.util', +- 'requests.packages.urllib3.packages.ssl_match_hostname', + ] + + requires = [] +--- a/requests/__init__.py ++++ b/requests/__init__.py +@@ -50,7 +50,7 @@ + + # Attempt to enable urllib3's SNI support, if possible + try: +- from .packages.urllib3.contrib import pyopenssl ++ from urllib3.contrib import pyopenssl + pyopenssl.inject_into_urllib3() + except ImportError: + pass +--- a/requests/exceptions.py ++++ b/requests/exceptions.py +@@ -7,7 +7,7 @@ + This module contains the set of Requests' exceptions. + + """ +-from .packages.urllib3.exceptions import HTTPError as BaseHTTPError ++from urllib3.exceptions import HTTPError as BaseHTTPError + + + class RequestException(IOError): +--- a/requests/sessions.py ++++ b/requests/sessions.py +@@ -21,7 +21,7 @@ + from .utils import to_key_val_list, default_headers, to_native_string + from .exceptions import ( + TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError) +-from .packages.urllib3._collections import RecentlyUsedContainer ++from urllib3._collections import RecentlyUsedContainer + from .structures import CaseInsensitiveDict + + from .adapters import HTTPAdapter diff --git a/debian/patches/03_export-IncompleteRead.patch b/debian/patches/03_export-IncompleteRead.patch new file mode 100644 index 0000000..d953df6 --- /dev/null +++ b/debian/patches/03_export-IncompleteRead.patch @@ -0,0 +1,25 @@ +Description: Export IncompleteRead from requests.compat since it's + imported by python-pip. +Author: Daniele Tricoli <eriol@mornie.org> +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/766419 +Last-Update: 2014-10-23 + +--- a/requests/compat.py ++++ b/requests/compat.py +@@ -92,6 +92,7 @@ + from Cookie import Morsel + from StringIO import StringIO + from urllib3.packages.ordered_dict import OrderedDict ++ from httplib import IncompleteRead + + builtin_str = str + bytes = str +@@ -107,6 +108,7 @@ + from http.cookies import Morsel + from io import StringIO + from collections import OrderedDict ++ from http.client import IncompleteRead + + builtin_str = str + str = str diff --git a/debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch b/debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch new file mode 100644 index 0000000..0e4db29 --- /dev/null +++ b/debian/patches/04_make-requests.packages.urllib3-same-as-urllib3.patch @@ -0,0 +1,46 @@ +Description: Make Python import system know that requests.packages.urllib3 and +urllib3 are the same thing. +Author: Jakub Wilk <jwilk@debian.org> +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/769047 +Bug-Debian: https://bugs.debian.org/769496 +Last-Update: 2015-05-03 + +--- a/requests/__init__.py ++++ b/requests/__init__.py +@@ -48,6 +48,28 @@ + __license__ = 'Apache 2.0' + __copyright__ = 'Copyright 2015 Kenneth Reitz' + ++# On Debian make Python import system know that requests.packages.urllib3 ++# and urllib3 are the same thing. ++import pkgutil ++import sys ++import urllib3 ++ ++def _attach_namespace(package, where): ++ # Attach package top namespace ++ sys.modules[where + '.' + package.__name__] = package ++ for loader, name, ispkg in pkgutil.walk_packages(package.__path__, ++ package.__name__ + '.'): ++ try: ++ module = __import__(name) ++ except ImportError: ++ continue ++ sys.modules[where + '.' + name] = module ++ ++_attach_namespace(urllib3, 'requests.packages') ++del _attach_namespace ++# Python 3 needs this imported explicitly. ++import requests.packages ++ + # Attempt to enable urllib3's SNI support, if possible + try: + from urllib3.contrib import pyopenssl +--- a/requests/packages/__init__.py ++++ b/requests/packages/__init__.py +@@ -1,3 +1,3 @@ + from __future__ import absolute_import + +-from . import urllib3 ++import urllib3 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..38fffac --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +01_use-system-ca-certificates.patch +02_use-system-chardet-and-urllib3.patch +03_export-IncompleteRead.patch +04_make-requests.packages.urllib3-same-as-urllib3.patch diff --git a/debian/python-requests-whl.install b/debian/python-requests-whl.install new file mode 100644 index 0000000..fd3f06f --- /dev/null +++ b/debian/python-requests-whl.install @@ -0,0 +1 @@ +usr/share/python-wheels diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..e06fbba --- /dev/null +++ b/debian/rules @@ -0,0 +1,30 @@ +#!/usr/bin/make -f + +export PYBUILD_NAME=requests + +%: + dh $@ --with python2,python3 --buildsystem=pybuild + +# The test suite currently requires external network access, so we +# can't enable it. Once this issue is fixed, it will be easy to +# re-enable. +# +# https://github.com/kennethreitz/requests/issues/2184 +# +# barry@debian.org 2014-11-19 +#override_dh_auto_test: +# PYBUILD_SYSTEM=custom \ +# PYBUILD_TEST_ARGS="{interpreter} test_requests.py" \ +# http_proxy= https_proxy= \ +# dh_auto_test + +override_dh_auto_test: + +override_dh_installchangelogs: + dh_installchangelogs HISTORY.rst + +override_dh_auto_install: + dh_auto_install + python3 setup.py bdist_wheel \ + --universal \ + -d $(CURDIR)/debian/tmp/usr/share/python-wheels diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..9234b78 --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=uversionmangle=s/(rc|a|b|c)/~$1/ \ +http://pypi.debian.net/requests/requests-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) |