Remove six dependency

examples/standalone_app.py

@@ -14,7 +14,7 @@
 
 import gunicorn.app.base
 
-from gunicorn.six import iteritems
+from six import iteritems
 
 
 def number_of_workers():

gunicorn/__init__.py

@@ -3,6 +3,6 @@
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
 
-version_info = (19, 9, 0)
+version_info = (19, 10, 0)
 __version__ = ".".join([str(v) for v in version_info])
 SERVER_SOFTWARE = "gunicorn/%s" % __version__

gunicorn/_compat.py

@@ -1,6 +1,6 @@
 import sys
 
-from gunicorn import six
+import six
 
 PY26 = (sys.version_info[:2] == (2, 6))
 PY33 = (sys.version_info >= (3, 3))
@@ -261,7 +261,7 @@ def urlsplit(url, scheme='', allow_fragments=True):
         return v
 
 else:
-    from gunicorn.six.moves.urllib.parse import urlsplit
+    from six.moves.urllib.parse import urlsplit
 
 
 import inspect

gunicorn/config.py

@@ -24,7 +24,7 @@
 from gunicorn import _compat
 from gunicorn.errors import ConfigError
 from gunicorn.reloader import reloader_engines
-from gunicorn import six
+import six
 from gunicorn import util
 
 KNOWN_SETTINGS = []

gunicorn/glogging.py

@@ -21,7 +21,7 @@
 import traceback
 
 from gunicorn import util
-from gunicorn.six import PY3, string_types
+from six import PY3, string_types
 
 
 # syslog facility codes

gunicorn/http/body.py

@@ -5,7 +5,7 @@
 
 from gunicorn.http.errors import (NoMoreData, ChunkMissingTerminator,
         InvalidChunkSize)
-from gunicorn import six
+import six
 
 
 class ChunkedReader(object):

gunicorn/http/message.py

@@ -15,7 +15,7 @@
     LimitRequestLine, LimitRequestHeaders)
 from gunicorn.http.errors import InvalidProxyLine, ForbiddenProxyRequest
 from gunicorn.http.errors import InvalidSchemeHeaders
-from gunicorn.six import BytesIO, string_types
+from six import BytesIO, string_types
 from gunicorn.util import split_request_uri
 
 MAX_REQUEST_LINE = 8190

gunicorn/http/unreader.py

@@ -5,7 +5,7 @@
 
 import os
 
-from gunicorn import six
+import six
 
 # Classes that can undo reading data from
 # a given type of data source.

gunicorn/http/wsgi.py

@@ -12,7 +12,7 @@
 from gunicorn._compat import unquote_to_wsgi_str
 from gunicorn.http.message import HEADER_RE
 from gunicorn.http.errors import InvalidHeader, InvalidHeaderName
-from gunicorn.six import string_types, binary_type, reraise
+from six import string_types, binary_type, reraise
 from gunicorn import SERVER_SOFTWARE
 import gunicorn.util as util
 

gunicorn/instrument/statsd.py

@@ -10,7 +10,7 @@
 from re import sub
 
 from gunicorn.glogging import Logger
-from gunicorn import six
+import six
 
 # Instrumentation constants
 METRIC_VAR = "metric"

gunicorn/selectors.py

@@ -14,7 +14,7 @@
 import sys
 
 from gunicorn._compat import wrap_error, InterruptedError
-from gunicorn import six
+import six
 
 
 # generic events, that must be mapped to implementation-specific ones