[Python-modules-commits] r31659 - in packages/python-botocore/trunk/debian (2 files)

[takaki at users.alioth.debian.org]

    Date: Tuesday, January 13, 2015 @ 13:49:43
  Author: takaki
Revision: 31659

new upstream

Modified:
  packages/python-botocore/trunk/debian/changelog
  packages/python-botocore/trunk/debian/patches/remove-duplicated-code

Modified: packages/python-botocore/trunk/debian/changelog
===================================================================
--- packages/python-botocore/trunk/debian/changelog	2015-01-11 12:27:22 UTC (rev 31658)
+++ packages/python-botocore/trunk/debian/changelog	2015-01-13 13:49:43 UTC (rev 31659)
@@ -1,3 +1,10 @@
+python-botocore (0.81.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Refresh patch.
+
+ -- TANIGUCHI Takaki <takaki at debian.org>  Tue, 13 Jan 2015 22:31:16 +0900
+
 python-botocore (0.69.0-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/python-botocore/trunk/debian/patches/remove-duplicated-code
===================================================================
--- packages/python-botocore/trunk/debian/patches/remove-duplicated-code	2015-01-11 12:27:22 UTC (rev 31658)
+++ packages/python-botocore/trunk/debian/patches/remove-duplicated-code	2015-01-13 13:49:43 UTC (rev 31659)
@@ -1,10 +1,13 @@
-Description: Remove duplicate code
- Upstream code contains duplicate code (requests and urllib3).
- Remove this code from orig-tarball and modify import directives.
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
  .
- python-botocore (0.29.0+repack-1) UNRELEASED; urgency=medium
+ python-botocore (0.81.0-1) UNRELEASED; urgency=medium
  .
-   * Remove duplicated code from upstream tarball.
+   * New upstream release
 Author: TANIGUCHI Takaki <takaki at debian.org>
 
 ---
@@ -14,17 +17,49 @@
 
 Origin: <vendor|upstream|other>, <url of original patch>
 Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
 Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
 Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
-Index: python-botocore-0.69.0/botocore/endpoint.py
-===================================================================
---- python-botocore-0.69.0.orig/botocore/endpoint.py	2014-11-05 09:35:21.714078645 +0900
-+++ python-botocore-0.69.0/botocore/endpoint.py	2014-11-05 09:35:21.710078697 +0900
-@@ -17,8 +17,8 @@
+--- python-botocore-0.81.0.orig/botocore/awsrequest.py
++++ python-botocore-0.81.0/botocore/awsrequest.py
+@@ -19,14 +19,14 @@ import socket
+ import inspect
+ 
+ from botocore.compat 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, HTTPResponse
+ from botocore.exceptions import UnseekableStreamError
+-from botocore.vendored.requests.packages.urllib3.connection import VerifiedHTTPSConnection
+-from botocore.vendored.requests.packages.urllib3.connection import HTTPConnection
+-from botocore.vendored.requests.packages.urllib3.connectionpool import HTTPConnectionPool
+-from botocore.vendored.requests.packages.urllib3.connectionpool import HTTPSConnectionPool
++from urllib3.connection import VerifiedHTTPSConnection
++from urllib3.connection import HTTPConnection
++from urllib3.connectionpool import HTTPConnectionPool
++from urllib3.connectionpool import HTTPSConnectionPool
+ 
+ 
+ logger = logging.getLogger(__name__)
+--- python-botocore-0.81.0.orig/botocore/compat.py
++++ python-botocore-0.81.0/botocore/compat.py
+@@ -16,7 +16,7 @@ import datetime
+ import sys
+ import inspect
+ 
+-from botocore.vendored import six
++import six
+ 
+ 
+ if six.PY3:
+--- python-botocore-0.81.0.orig/botocore/endpoint.py
++++ python-botocore-0.81.0/botocore/endpoint.py
+@@ -17,8 +17,8 @@ import logging
  import time
  import threading
  
@@ -32,14 +67,12 @@
 -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
-Index: python-botocore-0.69.0/botocore/retryhandler.py
-===================================================================
---- python-botocore-0.69.0.orig/botocore/retryhandler.py	2014-11-05 09:35:21.714078645 +0900
-+++ python-botocore-0.69.0/botocore/retryhandler.py	2014-11-05 09:35:21.710078697 +0900
-@@ -17,8 +17,8 @@
+ import botocore.exceptions
+--- python-botocore-0.81.0.orig/botocore/retryhandler.py
++++ python-botocore-0.81.0/botocore/retryhandler.py
+@@ -17,8 +17,8 @@ import functools
  import logging
  from binascii import crc32
  
@@ -50,39 +83,12 @@
  
  from botocore.exceptions import ChecksumError
  
-Index: python-botocore-0.69.0/botocore/awsrequest.py
-===================================================================
---- python-botocore-0.69.0.orig/botocore/awsrequest.py	2014-11-05 09:35:21.714078645 +0900
-+++ python-botocore-0.69.0/botocore/awsrequest.py	2014-11-05 09:36:25.553245163 +0900
-@@ -19,14 +19,14 @@
- import inspect
+--- python-botocore-0.81.0.orig/botocore/utils.py
++++ python-botocore-0.81.0/botocore/utils.py
+@@ -22,7 +22,7 @@ from dateutil.tz import tzlocal, tzutc
  
- 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, HTTPResponse
- from botocore.exceptions import UnseekableStreamError
--from botocore.vendored.requests.packages.urllib3.connection import VerifiedHTTPSConnection
--from botocore.vendored.requests.packages.urllib3.connection import HTTPConnection
--from botocore.vendored.requests.packages.urllib3.connectionpool import HTTPConnectionPool
--from botocore.vendored.requests.packages.urllib3.connectionpool import HTTPSConnectionPool
-+from urllib3.connection import VerifiedHTTPSConnection
-+from requests.packages.urllib3.connection import HTTPConnection
-+from requests.packages.urllib3.connectionpool import HTTPConnectionPool
-+from requests.packages.urllib3.connectionpool import HTTPSConnectionPool
- 
- 
- logger = logging.getLogger(__name__)
-Index: python-botocore-0.69.0/botocore/utils.py
-===================================================================
---- python-botocore-0.69.0.orig/botocore/utils.py	2014-11-05 09:35:21.714078645 +0900
-+++ python-botocore-0.69.0/botocore/utils.py	2014-11-05 09:36:52.764889848 +0900
-@@ -19,7 +19,7 @@
- 
  from botocore.exceptions import InvalidExpressionError, ConfigNotFound
- from botocore.compat import json, quote
+ from botocore.compat import json, quote, zip_longest
 -from botocore.vendored import requests
 +import requests
  from botocore.compat import OrderedDict