From 2487ca75258212a6da31d23657c16eb3a0a54dce Mon Sep 17 00:00:00 2001
From: Piper Merriam <pipermerriam@gmail.com>
Date: Sat, 4 Feb 2017 18:42:19 -0700
Subject: [PATCH] split out six module

---
 web3/providers/rpc.py              |  4 +++-
 web3/utils/caching.py              |  2 +-
 web3/utils/compat/__init__.py      | 15 ---------------
 web3/utils/compat/compat_gevent.py |  2 +-
 web3/utils/compat/compat_py2.py    |  5 -----
 web3/utils/compat/compat_py3.py    | 12 ------------
 web3/utils/six/__init__.py         | 15 +++++++++++++++
 web3/utils/six/six_py2.py          |  5 +++++
 web3/utils/six/six_py3.py          | 12 ++++++++++++
 9 files changed, 37 insertions(+), 35 deletions(-)
 create mode 100644 web3/utils/six/__init__.py
 create mode 100644 web3/utils/six/six_py2.py
 create mode 100644 web3/utils/six/six_py3.py

diff --git a/web3/providers/rpc.py b/web3/providers/rpc.py
index 788b9b3..1939d97 100644
--- a/web3/providers/rpc.py
+++ b/web3/providers/rpc.py
@@ -2,8 +2,10 @@ import logging
 
 from .base import JSONBaseProvider  # noqa: E402
 
-from web3.utils.compat import (
+from web3.utils.six import (
     urlunparse,
+)
+from web3.utils.compat import (
     make_post_request,
 )
 from web3.utils.http import construct_user_agent
diff --git a/web3/utils/caching.py b/web3/utils/caching.py
index 58ae43e..475ab0a 100644
--- a/web3/utils/caching.py
+++ b/web3/utils/caching.py
@@ -12,7 +12,7 @@ from .types import (
 from .string import (
     force_bytes,
 )
-from .compat import (
+from .six import (
     Generator,
 )
 
diff --git a/web3/utils/compat/__init__.py b/web3/utils/compat/__init__.py
index e4e6c34..cdd6f3c 100644
--- a/web3/utils/compat/__init__.py
+++ b/web3/utils/compat/__init__.py
@@ -1,21 +1,6 @@
-import sys
 import os
 
 
-if sys.version_info.major == 2:
-    from .compat_py2 import (
-        urlparse,
-        urlunparse,
-        Generator,
-    )
-else:
-    from .compat_py3 import (  # noqa: #401
-        urlparse,
-        urlunparse,
-        Generator,
-    )
-
-
 def get_threading_backend():
     if 'WEB3_THREADING_BACKEND' in os.environ:
         return os.environ['WEB3_THREADING_BACKEND']
diff --git a/web3/utils/compat/compat_gevent.py b/web3/utils/compat/compat_gevent.py
index 524b600..9a2ae97 100644
--- a/web3/utils/compat/compat_gevent.py
+++ b/web3/utils/compat/compat_gevent.py
@@ -14,7 +14,7 @@ import pylru
 
 from geventhttpclient import HTTPClient
 
-from web3.utils.compat import urlparse
+from web3.utils.six import urlparse
 
 
 _client_cache = pylru.lrucache(8)
diff --git a/web3/utils/compat/compat_py2.py b/web3/utils/compat/compat_py2.py
index d1c0795..e69de29 100644
--- a/web3/utils/compat/compat_py2.py
+++ b/web3/utils/compat/compat_py2.py
@@ -1,5 +0,0 @@
-from urlparse import (  # noqa: F401
-    urlparse,
-    urlunparse,
-)
-Generator = type(_ for _ in tuple())
diff --git a/web3/utils/compat/compat_py3.py b/web3/utils/compat/compat_py3.py
index 3363495..e69de29 100644
--- a/web3/utils/compat/compat_py3.py
+++ b/web3/utils/compat/compat_py3.py
@@ -1,12 +0,0 @@
-import collections
-
-from urllib.parse import (  # noqa: F401
-    urlparse,
-    urlunparse,
-)
-
-try:
-    Generator = collections.Generator
-except AttributeError:
-    # py34
-    Generator = type(_ for _ in tuple())
diff --git a/web3/utils/six/__init__.py b/web3/utils/six/__init__.py
new file mode 100644
index 0000000..e19433a
--- /dev/null
+++ b/web3/utils/six/__init__.py
@@ -0,0 +1,15 @@
+import sys
+
+
+if sys.version_info.major == 2:
+    from .compat_py2 import (
+        urlparse,
+        urlunparse,
+        Generator,
+    )
+else:
+    from .compat_py3 import (  # noqa: #401
+        urlparse,
+        urlunparse,
+        Generator,
+    )
diff --git a/web3/utils/six/six_py2.py b/web3/utils/six/six_py2.py
new file mode 100644
index 0000000..d1c0795
--- /dev/null
+++ b/web3/utils/six/six_py2.py
@@ -0,0 +1,5 @@
+from urlparse import (  # noqa: F401
+    urlparse,
+    urlunparse,
+)
+Generator = type(_ for _ in tuple())
diff --git a/web3/utils/six/six_py3.py b/web3/utils/six/six_py3.py
new file mode 100644
index 0000000..3363495
--- /dev/null
+++ b/web3/utils/six/six_py3.py
@@ -0,0 +1,12 @@
+import collections
+
+from urllib.parse import (  # noqa: F401
+    urlparse,
+    urlunparse,
+)
+
+try:
+    Generator = collections.Generator
+except AttributeError:
+    # py34
+    Generator = type(_ for _ in tuple())