debian/0000775000000000000000000000000012600620275007170 5ustar debian/control0000664000000000000000000000241712600620344010574 0ustar Source: python-botocore Section: python Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Python Modules Team Uploaders: TANIGUCHI Takaki Build-Depends: debhelper (>= 9) , python-all , python-setuptools , python3-all , python3-setuptools Standards-Version: 3.9.5 Homepage: https://github.com/boto/botocore Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/python-botocore/trunk/ Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/python-botocore/trunk/ Package: python-botocore Architecture: all Depends: ${python:Depends}, python-requests, ${misc:Depends} Description: Low-level, data-driven core of boto 3 (Python 2) A low-level interface to a growing number of Amazon Web Services. The botocore package is the foundation for AWS-CLI. . This package contains the module for Python 2. Package: python3-botocore Architecture: all Depends: ${python3:Depends}, python3-requests, ${misc:Depends} Description: Low-level, data-driven core of boto 3 (Python 3) A low-level interface to a growing number of Amazon Web Services. The botocore package is the foundation for AWS-CLI. . This package contains the module for Python 3. debian/docs0000664000000000000000000000003412261742256010047 0ustar README.rst requirements.txt debian/changelog0000664000000000000000000000151012600620275011037 0ustar python-botocore (0.29.0+repack-2ubuntu0.1) trusty; urgency=low * debian/patches/support-python3.4.1: Fix use of inspect with Python 3.4.1 or later. (LP: #1499075) -- Evan Broder Wed, 23 Sep 2015 17:35:34 -0400 python-botocore (0.29.0+repack-2) unstable; urgency=medium * debian/watch: Add debian version mangle. * debian/control: Add python-requests to Depends. (Closes: #734382) -- TANIGUCHI Takaki Tue, 04 Feb 2014 18:28:43 +0900 python-botocore (0.29.0+repack-1) unstable; urgency=medium * Remove duplicated code from upstream tarball. -- TANIGUCHI Takaki Sun, 05 Jan 2014 23:02:56 +0900 python-botocore (0.29.0-1) unstable; urgency=low * Initial release (Closes: #733214) -- TANIGUCHI Takaki Fri, 27 Dec 2013 16:45:14 +0900 debian/source/0000775000000000000000000000000012274132254010472 5ustar debian/source/format0000664000000000000000000000001412261742256011705 0ustar 3.0 (quilt) debian/compat0000664000000000000000000000000212261742256010375 0ustar 9 debian/patches/0000775000000000000000000000000012600620255010615 5ustar debian/patches/series0000664000000000000000000000005312600620255012030 0ustar remove-duplicated-code support-python3.4.1 debian/patches/remove-duplicated-code0000664000000000000000000000477012262260777015106 0ustar Description: Remove duplicate code Upstream code contains duplicate code (requests and urllib3). Remove this code from orig-tarball and modify import directives. . python-botocore (0.29.0+repack-1) UNRELEASED; urgency=medium . * Remove duplicated code from upstream tarball. Author: TANIGUCHI Takaki --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: Last-Update: --- python-botocore-0.29.0+repack.orig/botocore/awsrequest.py +++ python-botocore-0.29.0+repack/botocore/awsrequest.py @@ -23,8 +23,8 @@ import logging import six -from botocore.vendored.requests import models -from botocore.vendored.requests.sessions import REDIRECT_STATI +from requests import models +from requests.sessions import REDIRECT_STATI from botocore.compat import HTTPHeaders, file_type from botocore.exceptions import UnseekableStreamError --- python-botocore-0.29.0+repack.orig/botocore/credentials.py +++ python-botocore-0.29.0+repack/botocore/credentials.py @@ -21,7 +21,7 @@ # IN THE SOFTWARE. # import os -from botocore.vendored import requests +import requests import logging from six.moves import configparser --- python-botocore-0.29.0+repack.orig/botocore/endpoint.py +++ python-botocore-0.29.0+repack/botocore/endpoint.py @@ -25,8 +25,8 @@ import logging import time import threading -from botocore.vendored.requests.sessions import Session -from botocore.vendored.requests.utils import get_environ_proxies +from requests.sessions import Session +from requests.utils import get_environ_proxies import six import botocore.response --- python-botocore-0.29.0+repack.orig/botocore/retryhandler.py +++ python-botocore-0.29.0+repack/botocore/retryhandler.py @@ -25,8 +25,8 @@ import functools import logging from binascii import crc32 -from botocore.vendored.requests import ConnectionError -from botocore.vendored.requests.packages.urllib3.exceptions import ClosedPoolError +from requests import ConnectionError +from urllib3.exceptions import ClosedPoolError from botocore.exceptions import ChecksumError debian/patches/support-python3.4.10000664000000000000000000000513312600620255014161 0ustar From: James Saryerwinnie Description: Support python3.4.1 . Python 3.4.1 changed inspect.getargspec to raise if a function contains either annotations or keyword-only args. This affects functools.partials. Origin: backport https://github.com/boto/botocore/commit/89626230754e534eb51017d5b13a546db755d71b Bug: https://github.com/boto/botocore/pull/300 Bug: https://github.com/aws/aws-cli/issues/800 Reviewed-By: Evan Broder Index: python-botocore-0.29.0+repack/botocore/compat.py =================================================================== --- python-botocore-0.29.0+repack.orig/botocore/compat.py 2015-09-23 17:15:12.718917268 -0400 +++ python-botocore-0.29.0+repack/botocore/compat.py 2015-09-23 17:19:58.534233692 -0400 @@ -22,6 +22,7 @@ import sys import copy import six +import inspect if six.PY3: from six.moves import http_client class HTTPHeaders(http_client.HTTPMessage): @@ -34,6 +35,12 @@ from urllib.parse import parse_qsl from io import IOBase as _IOBase file_type = _IOBase + + def accepts_kwargs(func): + # In python3.4.1, there's backwards incompatible + # changes when using getargspec with functools.partials. + return inspect.getfullargspec(func)[2] + else: from urllib import quote from urllib import unquote @@ -51,6 +58,9 @@ for field, value in self._headers: yield field + def accepts_kwargs(func): + return inspect.getargspec(func)[2] + try: from collections import OrderedDict except ImportError: Index: python-botocore-0.29.0+repack/botocore/hooks.py =================================================================== --- python-botocore-0.29.0+repack.orig/botocore/hooks.py 2015-09-23 17:15:12.718917268 -0400 +++ python-botocore-0.29.0+repack/botocore/hooks.py 2015-09-23 17:20:49.654295506 -0400 @@ -19,10 +19,10 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. # -import inspect import six from collections import defaultdict, deque import logging +from botocore.compat import accepts_kwargs logger = logging.getLogger(__name__) @@ -81,13 +81,11 @@ """ try: - argspec = inspect.getargspec(func) - except TypeError: - return False - else: - if argspec[2] is None: + if not accepts_kwargs(func): raise ValueError("Event handler %s must accept keyword " "arguments (**kwargs)" % func) + except TypeError: + return False class EventHooks(BaseEventHooks): debian/copyright0000664000000000000000000000252112262234232011121 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: python-botocore Source: https://pypi.python.org/pypi/botocore Files: * Copyright: Mitch Garnaat License: MIT Files: debian/* Copyright: 2013 TANIGUCHI Takaki License: MIT License: MIT 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. debian/watch0000664000000000000000000000016412262401412010214 0ustar version=3 opts=dversionmangle=s/\+repack// \ http://pypi.python.org/packages/source/b/botocore/botocore-(.*).tar.gz debian/rules0000775000000000000000000000041612261742256010260 0ustar #!/usr/bin/make -f # -*- makefile -*- # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 export PYBUILD_DESTDIR_python2=debian/python-botocore/ export PYBUILD_DESTDIR_python3=debian/python3-botocore/ %: dh $@ --with python2,python3 --buildsystem=pybuild