From 315a5661e35c214cfa6649ce5c08c65dbfd9e6c3 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.org>
Date: Mon, 12 Mar 2018 11:47:09 -0400
Subject: [PATCH] new approach

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
---
 requests/compat.py | 40 +++++++++++-----------------------------
 tests/conftest.py  |  2 +-
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/requests/compat.py b/requests/compat.py
index 55da272a..33bbefee 100644
--- a/requests/compat.py
+++ b/requests/compat.py
@@ -29,33 +29,15 @@ is_py3 = (_ver[0] == 3)
 # Specifics
 # ---------
 
-if is_py2:
-    from urllib import (
-        quote, unquote, quote_plus, unquote_plus, urlencode, getproxies,
-        proxy_bypass, proxy_bypass_environment, getproxies_environment)
-    from urlparse import urlparse, urlunparse, urljoin, urlsplit, urldefrag
-    from urllib2 import parse_http_list
-    import cookielib
-    from Cookie import Morsel
-    from StringIO import StringIO
+from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, quote_plus, unquote_plus, urldefrag
+from urllib.request import parse_http_list, getproxies, proxy_bypass, proxy_bypass_environment, getproxies_environment
+from http import cookiejar as cookielib
+from http.cookies import Morsel
+from io import StringIO
 
-    builtin_str = str
-    bytes = str
-    str = unicode
-    basestring = basestring
-    numeric_types = (int, long, float)
-    integer_types = (int, long)
-
-elif is_py3:
-    from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, quote_plus, unquote_plus, urldefrag
-    from urllib.request import parse_http_list, getproxies, proxy_bypass, proxy_bypass_environment, getproxies_environment
-    from http import cookiejar as cookielib
-    from http.cookies import Morsel
-    from io import StringIO
-
-    builtin_str = str
-    str = str
-    bytes = bytes
-    basestring = (str, bytes)
-    numeric_types = (int, float)
-    integer_types = (int,)
+builtin_str = str
+str = str
+bytes = bytes
+basestring = (str, bytes)
+numeric_types = (int, float)
+integer_types = (int,)
diff --git a/tests/conftest.py b/tests/conftest.py
index cd64a765..6aa8edfe 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import pytest
-from requests.compat import urljoin
+from urllib.parse import urljoin
 
 
 def prepare_url(value):