Merge pull request #154 from pipermerriam/piper/code-reorganization

split out six module

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

web3/utils/caching.py

@@ -12,7 +12,7 @@ from .types import (
 from .string import (
     force_bytes,
 )
-from .compat import (
+from .six import (
     Generator,
 )
 

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']

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)

web3/utils/compat/compat_py2.py

@@ -1,5 +0,0 @@
-from urlparse import (  # noqa: F401
-    urlparse,
-    urlunparse,
-)
-Generator = type(_ for _ in tuple())

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())

web3/utils/six/__init__.py

@@ -0,0 +1,15 @@
+import sys
+
+
+if sys.version_info.major == 2:
+    from .six_py2 import (
+        urlparse,
+        urlunparse,
+        Generator,
+    )
+else:
+    from .six_py3 import (  # noqa: #401
+        urlparse,
+        urlunparse,
+        Generator,
+    )

web3/utils/six/six_py2.py

@@ -0,0 +1,5 @@
+from urlparse import (  # noqa: F401
+    urlparse,
+    urlunparse,
+)
+Generator = type(_ for _ in tuple())

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())