Python 3 style cleanup (part 2)

docs/source/settings.rst

@@ -523,27 +523,12 @@ SSL certificate file
 
 **Command line:** ``--ssl-version``
 
-**Default:** ``<_SSLMethod.PROTOCOL_TLS: 2>``
+**Default:** (ignored)
 
 SSL version to use (see stdlib ssl module's).
 
 .. deprecated:: 21.0
-   The option is deprecated and it is currently ignored. Use :ref:`ssl-context` instead.
-
-============= ============
---ssl-version Description
-============= ============
-SSLv3         SSLv3 is not-secure and is strongly discouraged.
-SSLv23        Alias for TLS. Deprecated in Python 3.6, use TLS.
-TLS           Negotiate highest possible version between client/server.
-              Can yield SSL. (Python 3.6+)
-TLSv1         TLS 1.0
-TLSv1_1       TLS 1.1 (Python 3.4+)
-TLSv1_2       TLS 1.2 (Python 3.4+)
-TLS_SERVER    Auto-negotiate the highest protocol version like TLS,
-              but only support server-side SSLSocket connections.
-              (Python 3.6+)
-============= ============
+   The option is deprecated and it is currently **ignored**. Use :ref:`ssl-context` instead.
 
 .. versionchanged:: 19.7
    The default value has been changed from ``ssl.PROTOCOL_TLSv1`` to
@@ -1166,9 +1151,11 @@ Note that this affects unix socket permissions.
 
 A valid value for the ``os.umask(mode)`` call or a string compatible
 with ``int(value, 0)`` (``0`` means Python guesses the base, so values
-like ``0``, ``0xFF``, ``0022`` are valid for decimal, hex, and octal
+like ``0``, ``0xFF``, ``0o022`` are valid for decimal, hex, and octal
 representations)
 
+.. note:: For historical reasons, leading zero is treated like ``0o``.
+
 .. _initgroups:
 
 ``initgroups``
@@ -1650,14 +1637,14 @@ libraries may be installed using setuptools' ``extras_require`` feature.
 A string referring to one of the following bundled classes:
 
 * ``sync``
+* ``gthread``
 * ``eventlet`` - Requires eventlet >= 0.24.1 (or install it via
-  ``pip install gunicorn[eventlet]``)
+  ``pip install gunicorn[eventlet]``).
+  Usages in new projects are discouraged.
 * ``gevent``   - Requires gevent >= 1.4 (or install it via
   ``pip install gunicorn[gevent]``)
 * ``tornado``  - Requires tornado >= 0.2 (or install it via
   ``pip install gunicorn[tornado]``)
-* ``gthread``  - Python 2 requires the futures package to be installed
-  (or install it via ``pip install gunicorn[gthread]``)
 
 Optionally, you can provide your own worker by giving Gunicorn a
 Python path to a subclass of ``gunicorn.workers.base.Worker``.

gunicorn/arbiter.py

@@ -362,9 +362,7 @@ def sleep(self):
             while os.read(self.PIPE[0], 1):
                 pass
         except OSError as e:
-            # TODO: select.error is a subclass of OSError since Python 3.3.
-            error_number = getattr(e, 'errno', e.args[0])
-            if error_number not in [errno.EAGAIN, errno.EINTR]:
+            if e.errno not in [errno.EAGAIN, errno.EINTR]:
                 raise
         except KeyboardInterrupt:
             sys.exit()

gunicorn/config.py

@@ -678,14 +678,14 @@ class WorkerClass(Setting):
         A string referring to one of the following bundled classes:
 
         * ``sync``
+        * ``gthread``
         * ``eventlet`` - Requires eventlet >= 0.24.1 (or install it via
-          ``pip install gunicorn[eventlet]``)
+          ``pip install gunicorn[eventlet]``).
+          Usages in new projects are discouraged.
         * ``gevent``   - Requires gevent >= 1.4 (or install it via
           ``pip install gunicorn[gevent]``)
         * ``tornado``  - Requires tornado >= 0.2 (or install it via
           ``pip install gunicorn[tornado]``)
-        * ``gthread``  - Python 2 requires the futures package to be installed
-          (or install it via ``pip install gunicorn[gthread]``)
 
         Optionally, you can provide your own worker by giving Gunicorn a
         Python path to a subclass of ``gunicorn.workers.base.Worker``.
@@ -1197,8 +1197,10 @@ class Umask(Setting):
 
         A valid value for the ``os.umask(mode)`` call or a string compatible
         with ``int(value, 0)`` (``0`` means Python guesses the base, so values
-        like ``0``, ``0xFF``, ``0022`` are valid for decimal, hex, and octal
+        like ``0``, ``0xFF``, ``0o022`` are valid for decimal, hex, and octal
         representations)
+
+        .. note:: For historical reasons, leading zero is treated like ``0o``.
         """
 
 
@@ -2125,33 +2127,14 @@ class SSLVersion(Setting):
     section = "SSL"
     cli = ["--ssl-version"]
     validator = validate_ssl_version
+    default = object()  # always warn unless left at default
+    default_doc = "(ignored)"
 
-    if hasattr(ssl, "PROTOCOL_TLS"):
-        default = ssl.PROTOCOL_TLS
-    else:
-        default = ssl.PROTOCOL_SSLv23
-
-    default = ssl.PROTOCOL_SSLv23
     desc = """\
     SSL version to use (see stdlib ssl module's).
 
     .. deprecated:: 21.0
-       The option is deprecated and it is currently ignored. Use :ref:`ssl-context` instead.
-
-    ============= ============
-    --ssl-version Description
-    ============= ============
-    SSLv3         SSLv3 is not-secure and is strongly discouraged.
-    SSLv23        Alias for TLS. Deprecated in Python 3.6, use TLS.
-    TLS           Negotiate highest possible version between client/server.
-                  Can yield SSL. (Python 3.6+)
-    TLSv1         TLS 1.0
-    TLSv1_1       TLS 1.1 (Python 3.4+)
-    TLSv1_2       TLS 1.2 (Python 3.4+)
-    TLS_SERVER    Auto-negotiate the highest protocol version like TLS,
-                  but only support server-side SSLSocket connections.
-                  (Python 3.6+)
-    ============= ============
+       The option is deprecated and it is currently **ignored**. Use :ref:`ssl-context` instead.
 
     .. versionchanged:: 19.7
        The default value has been changed from ``ssl.PROTOCOL_TLSv1`` to

gunicorn/pidfile.py

@@ -74,12 +74,12 @@ def validate(self):
                     os.kill(wpid, 0)
                     return wpid
                 except OSError as e:
-                    if e.args[0] == errno.EPERM:
+                    if e.errno == errno.EPERM:
                         return wpid
-                    if e.args[0] == errno.ESRCH:
+                    if e.errno == errno.ESRCH:
                         return
                     raise
         except OSError as e:
-            if e.args[0] == errno.ENOENT:
+            if e.errno == errno.ENOENT:
                 return
             raise

gunicorn/sock.py

@@ -107,7 +107,7 @@ def __init__(self, addr, conf, log, fd=None):
             try:
                 st = os.stat(addr)
             except OSError as e:
-                if e.args[0] != errno.ENOENT:
+                if e.errno != errno.ENOENT:
                     raise
             else:
                 if stat.S_ISSOCK(st.st_mode):
@@ -183,9 +183,9 @@ def create_sockets(conf, log, fds=None):
             try:
                 sock = sock_type(addr, conf, log)
             except OSError as e:
-                if e.args[0] == errno.EADDRINUSE:
+                if e.errno == errno.EADDRINUSE:
                     log.error("Connection in use: %s", str(addr))
-                if e.args[0] == errno.EADDRNOTAVAIL:
+                if e.errno == errno.EADDRNOTAVAIL:
                     log.error("Invalid address: %s", str(addr))
                 msg = "connection to {addr} failed: {error}"
                 log.error(msg.format(addr=str(addr), error=str(e)))

gunicorn/workers/sync.py

@@ -40,9 +40,9 @@ def wait(self, timeout):
                 return ret[0]
 
         except OSError as e:
-            if e.args[0] == errno.EINTR:
+            if e.errno == errno.EINTR:
                 return self.sockets
-            if e.args[0] == errno.EBADF:
+            if e.errno == errno.EBADF:
                 if self.nr < 0:
                     return self.sockets
                 else:

tests/requests/invalid/001.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import NoMoreData
-request = NoMoreData
+
+request = NoMoreData

tests/requests/invalid/002.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidRequestLine
+
 request = InvalidRequestLine

tests/requests/invalid/003.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidRequestLine
+
 request = InvalidRequestLine

tests/requests/invalid/003b.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidRequestMethod
-request = InvalidRequestMethod
+
+request = InvalidRequestMethod

tests/requests/invalid/003c.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidRequestMethod
+
 request = InvalidRequestMethod

tests/requests/invalid/004.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHTTPVersion
-request = InvalidHTTPVersion
+
+request = InvalidHTTPVersion

tests/requests/invalid/005.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHeaderName
-request = InvalidHeaderName
+
+request = InvalidHeaderName

tests/requests/invalid/006.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import LimitRequestLine
+
 request = LimitRequestLine

tests/requests/invalid/007.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import LimitRequestHeaders
+
 request = LimitRequestHeaders

tests/requests/invalid/008.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import LimitRequestHeaders
+
 request = LimitRequestHeaders

tests/requests/invalid/009.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import LimitRequestHeaders
+
 request = LimitRequestHeaders

tests/requests/invalid/010.py

@@ -1,6 +1,4 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import LimitRequestHeaders
 
 request = LimitRequestHeaders
-cfg = Config()
 cfg.set('limit_request_field_size', 10)

tests/requests/invalid/011.py

@@ -1,6 +1,4 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import LimitRequestHeaders
 
 request = LimitRequestHeaders
-cfg = Config()
 cfg.set('limit_request_fields', 2)

tests/requests/invalid/012.py

@@ -1,6 +1,4 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import LimitRequestHeaders
 
 request = LimitRequestHeaders
-cfg = Config()
 cfg.set('limit_request_field_size', 98)

tests/requests/invalid/013.py

@@ -1,8 +1,6 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import LimitRequestHeaders
 
 request = LimitRequestHeaders
-cfg = Config()
 cfg.set('limit_request_field_size', 14)
 
 # once this option is removed, this test should not be dropped;

tests/requests/invalid/017.py

@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import LimitRequestHeaders
 
-cfg = Config()
 request = LimitRequestHeaders

tests/requests/invalid/018.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHTTPVersion
+
 request = InvalidHTTPVersion

tests/requests/invalid/019.py

@@ -1,6 +1,4 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidSchemeHeaders
 
 request = InvalidSchemeHeaders
-cfg = Config()
 cfg.set('forwarded_allow_ips', '*')

tests/requests/invalid/020.py

@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeaderName
 
-cfg = Config()
 request = InvalidHeaderName

tests/requests/invalid/021.py

@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeader
 
-cfg = Config()
 request = InvalidHeader

tests/requests/invalid/022.py

@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeader
 
-cfg = Config()
 request = InvalidHeader

tests/requests/invalid/023.py

@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeader
 
-cfg = Config()
 request = InvalidHeader

tests/requests/invalid/024.py

@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeader
 
-cfg = Config()
 request = InvalidHeader

tests/requests/invalid/040.py

@@ -1,7 +1,5 @@
 from gunicorn.http.errors import InvalidHeaderName
-from gunicorn.config import Config
 
-cfg = Config()
 cfg.set("header_map", "refuse")
 
 request = InvalidHeaderName

tests/requests/invalid/chunked_01.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidChunkSize
+
 request = InvalidChunkSize

tests/requests/invalid/chunked_02.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHeader
+
 request = InvalidHeader

tests/requests/invalid/chunked_03.py

@@ -1,2 +1,3 @@
-from gunicorn.http.errors import InvalidHeader 
-request = InvalidHeader 
+from gunicorn.http.errors import InvalidHeader
+
+request = InvalidHeader

tests/requests/invalid/chunked_04.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHeader
+
 request = InvalidHeader

tests/requests/invalid/chunked_05.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHeader
+
 request = InvalidHeader

tests/requests/invalid/chunked_06.py

@@ -1,2 +1,3 @@
-from gunicorn.http.errors import InvalidHeader 
-request = InvalidHeader 
+from gunicorn.http.errors import InvalidHeader
+
+request = InvalidHeader

tests/requests/invalid/chunked_07.py

@@ -1,7 +1,5 @@
 from gunicorn.http.errors import InvalidHeaderName
-from gunicorn.config import Config
 
-cfg = Config()
 cfg.set("header_map", "refuse")
 
 request = InvalidHeaderName

tests/requests/invalid/chunked_08.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidHeader
+
 request = InvalidHeader

tests/requests/invalid/chunked_09.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidChunkSize
+
 request = InvalidChunkSize

tests/requests/invalid/chunked_10.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidChunkSize
+
 request = InvalidChunkSize

tests/requests/invalid/chunked_11.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidChunkSize
+
 request = InvalidChunkSize

tests/requests/invalid/chunked_12.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidChunkSize
+
 request = InvalidChunkSize

tests/requests/invalid/chunked_13.py

@@ -1,2 +1,3 @@
 from gunicorn.http.errors import InvalidChunkSize
+
 request = InvalidChunkSize

tests/requests/invalid/invalid_field_value_01.py

@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidHeader
 
-cfg = Config()
 request = InvalidHeader

tests/requests/invalid/nonascii_01.py

@@ -1,5 +1,3 @@
-from gunicorn.config import Config
 from gunicorn.http.errors import InvalidRequestMethod
 
-cfg = Config()
 request = InvalidRequestMethod