From c2c322bad8669adbfd02cd6167a9dc45d2c4d9240370eba0f27f762d22cb0719 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Tue, 6 Oct 2015 18:34:43 +0000
Subject: [PATCH] Accepting request 336832 from
 home:alois:branches:devel:languages:python

Fixes the no-bundle patch in regard to urllib3.

OBS-URL: https://build.opensuse.org/request/show/336832
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=73
---
 python-requests.changes          |  5 +++
 requests-do-not-use-bundle.patch | 55 ++++++++++++++++++++++----------
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/python-requests.changes b/python-requests.changes
index 30be87e..788579e 100644
--- a/python-requests.changes
+++ b/python-requests.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct  6 17:48:20 UTC 2015 - aloisio@gmx.com
+
+- Fixed requests-do-not-use-bundle.patch 
+
 -------------------------------------------------------------------
 Mon Oct  5 17:18:43 UTC 2015 - p.drouand@gmail.com
 
diff --git a/requests-do-not-use-bundle.patch b/requests-do-not-use-bundle.patch
index f2f2c92..f5db3f9 100644
--- a/requests-do-not-use-bundle.patch
+++ b/requests-do-not-use-bundle.patch
@@ -1,6 +1,8 @@
---- a/requests/adapters.py	2015-03-14 09:23:40.000000000 +0100
-+++ b/requests/adapters.py	2015-09-28 14:45:56.745440792 +0200
-@@ -11,22 +11,22 @@
+Index: requests-2.7.0/requests/adapters.py
+===================================================================
+--- requests-2.7.0.orig/requests/adapters.py
++++ requests-2.7.0/requests/adapters.py
+@@ -11,22 +11,22 @@ and maintain connections.
  import socket
  
  from .models import Response
@@ -35,8 +37,10 @@
  from .cookies import extract_cookies_to_jar
  from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError,
                           ProxyError, RetryError)
---- a/requests/compat.py	2015-02-24 08:46:40.000000000 +0100
-+++ b/requests/compat.py	2015-09-28 14:46:38.358682814 +0200
+Index: requests-2.7.0/requests/compat.py
+===================================================================
+--- requests-2.7.0.orig/requests/compat.py
++++ requests-2.7.0/requests/compat.py
 @@ -4,8 +4,7 @@
  pythoncompat
  """
@@ -47,9 +51,20 @@
  import sys
  
  # -------
---- a/requests/exceptions.py	2015-02-24 08:46:40.000000000 +0100
-+++ b/requests/exceptions.py	2015-09-28 14:47:59.699270143 +0200
-@@ -7,7 +7,7 @@
+@@ -39,7 +38,7 @@ if is_py2:
+     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
+Index: requests-2.7.0/requests/exceptions.py
+===================================================================
+--- requests-2.7.0.orig/requests/exceptions.py
++++ requests-2.7.0/requests/exceptions.py
+@@ -7,7 +7,7 @@ requests.exceptions
  This module contains the set of Requests' exceptions.
  
  """
@@ -58,9 +73,11 @@
  
  
  class RequestException(IOError):
---- a/requests/__init__.py	2015-05-03 17:00:37.000000000 +0200
-+++ b/requests/__init__.py	2015-09-28 14:48:55.561942516 +0200
-@@ -50,7 +50,7 @@
+Index: requests-2.7.0/requests/__init__.py
+===================================================================
+--- requests-2.7.0.orig/requests/__init__.py
++++ requests-2.7.0/requests/__init__.py
+@@ -50,7 +50,7 @@ __copyright__ = 'Copyright 2015 Kenneth
  
  # Attempt to enable urllib3's SNI support, if possible
  try:
@@ -69,9 +86,11 @@
      pyopenssl.inject_into_urllib3()
  except ImportError:
      pass
---- a/requests/models.py	2015-04-23 08:22:47.000000000 +0200
-+++ b/requests/models.py	2015-09-28 14:49:35.242296252 +0200
-@@ -16,10 +16,10 @@
+Index: requests-2.7.0/requests/models.py
+===================================================================
+--- requests-2.7.0.orig/requests/models.py
++++ requests-2.7.0/requests/models.py
+@@ -16,10 +16,10 @@ from .structures import CaseInsensitiveD
  
  from .auth import HTTPBasicAuth
  from .cookies import cookiejar_from_dict, get_cookie_header, _copy_cookie_jar
@@ -86,9 +105,11 @@
      DecodeError, ReadTimeoutError, ProtocolError, LocationParseError)
  from .exceptions import (
      HTTPError, MissingSchema, InvalidURL, ChunkedEncodingError,
---- a/requests/sessions.py	2015-04-23 08:22:47.000000000 +0200
-+++ b/requests/sessions.py	2015-09-28 14:50:19.381471320 +0200
-@@ -21,7 +21,7 @@
+Index: requests-2.7.0/requests/sessions.py
+===================================================================
+--- requests-2.7.0.orig/requests/sessions.py
++++ requests-2.7.0/requests/sessions.py
+@@ -21,7 +21,7 @@ from .hooks import default_hooks, dispat
  from .utils import to_key_val_list, default_headers, to_native_string
  from .exceptions import (
      TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError)