Merge pull request #3189 from pajod/patch-py36

chore: eat Python 2 leftovers

Author: benoitc

docs/source/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Gunicorn documentation build configuration file
 #

examples/alt_spec.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # An example of how to pass information from the command line to
 # a WSGI app. Only applies to the native WSGI workers used by

examples/boot_fail.py

@@ -1,4 +1,3 @@
-
 raise RuntimeError("Bad app!")
 
 def app(environ, start_response):

examples/deep/test.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

examples/echo.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

examples/frameworks/cherryapp.py

@@ -1,7 +1,7 @@
 import cherrypy
 
 
-class Root(object):
+class Root:
     @cherrypy.expose
     def index(self):
         return 'Hello World!'

examples/frameworks/django/testing/testing/apps/someapp/middleware.py

@@ -8,7 +8,7 @@ def child_process(queue):
         requests.get('http://requestb.in/15s95oz1')
 
 
-class GunicornSubProcessTestMiddleware(object):
+class GunicornSubProcessTestMiddleware:
     def __init__(self):
         super().__init__()
         self.queue = Queue()

examples/frameworks/tornadoapp.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

examples/longpoll.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
@@ -7,7 +6,7 @@
 import sys
 import time
 
-class TestIter(object):
+class TestIter:
 
     def __iter__(self):
         lines = [b'line 1\n', b'line 2\n']

examples/multiapp.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
@@ -25,7 +24,7 @@
 from test import app as app2
 
 
-class Application(object):
+class Application:
     def __init__(self):
         self.map = Mapper()
         self.map.connect('app1', '/app1url', app=app1)

examples/multidomainapp.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

examples/readline_app.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

examples/sendfile.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

examples/slowclient.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

examples/standalone_app.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #
 # An example of a standalone application using the internal API of Gunicorn.
 #

examples/test.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

examples/timeout.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

examples/websocket/gevent_websocket.py

@@ -1,4 +1,3 @@
-
 import collections
 import errno
 import re
@@ -17,7 +16,7 @@
 
 WS_KEY = b"258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
 
-class WebSocketWSGI(object):
+class WebSocketWSGI:
     def __init__(self, handler):
         self.handler = handler
 
@@ -118,7 +117,7 @@ def __call__(self, environ, start_response):
         # doesn't barf on the fact that we didn't call start_response
         return ALREADY_HANDLED
 
-class WebSocket(object):
+class WebSocket:
     """A websocket object that handles the details of
     serialization/deserialization to the socket.
 

examples/websocket/websocket.py

@@ -1,4 +1,3 @@
-
 import collections
 import errno
 import re
@@ -18,7 +17,7 @@
 
 WS_KEY = b"258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
 
-class WebSocketWSGI(object):
+class WebSocketWSGI:
     def __init__(self, handler):
         self.handler = handler
 
@@ -119,7 +118,7 @@ def __call__(self, environ, start_response):
         # doesn't barf on the fact that we didn't call start_response
         return ALREADY_HANDLED
 
-class WebSocket(object):
+class WebSocket:
     """A websocket object that handles the details of
     serialization/deserialization to the socket.
 

examples/when_ready.conf.py

@@ -17,7 +17,7 @@ def __init__(self, server, max_mem):
     def memory_usage(self, pid):
         try:
             out = commands.getoutput("ps -o rss -p %s" % pid)
-        except IOError:
+        except OSError:
             return -1
         used_mem = sum(int(x) for x in out.split('\n')[1:])
         return used_mem

gunicorn/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

gunicorn/__main__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

gunicorn/app/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

gunicorn/app/base.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
@@ -14,7 +13,7 @@
 from gunicorn import debug
 
 
-class BaseApplication(object):
+class BaseApplication:
     """
     An application interface for configuring and loading
     the various necessities for any given web framework.

gunicorn/app/pasterapp.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

gunicorn/app/wsgiapp.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

gunicorn/arbiter.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
@@ -18,7 +17,7 @@
 from gunicorn import __version__, SERVER_SOFTWARE
 
 
-class Arbiter(object):
+class Arbiter:
     """
     Arbiter maintain the workers processes alive. It launches or
     kills them if needed. It also manages application reloading
@@ -333,7 +332,7 @@ def wakeup(self):
         """
         try:
             os.write(self.PIPE[1], b'.')
-        except IOError as e:
+        except OSError as e:
             if e.errno not in [errno.EAGAIN, errno.EINTR]:
                 raise
 
@@ -362,7 +361,7 @@ def sleep(self):
                 return
             while os.read(self.PIPE[0], 1):
                 pass
-        except (select.error, OSError) as e:
+        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]:

gunicorn/config.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
@@ -44,7 +43,7 @@ def auto_int(_, x):
     return int(x, 0)
 
 
-class Config(object):
+class Config:
 
     def __init__(self, usage=None, prog=None):
         self.settings = make_settings()
@@ -256,7 +255,7 @@ def fmt_desc(cls, desc):
         setattr(cls, "short", desc.splitlines()[0])
 
 
-class Setting(object):
+class Setting:
     name = None
     value = None
     section = None

gunicorn/debug.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
@@ -16,7 +15,7 @@
 _token_spliter = re.compile(r'\W+')
 
 
-class Spew(object):
+class Spew:
 
     def __init__(self, trace_names=None, show_values=True):
         self.trace_names = trace_names
@@ -37,7 +36,7 @@ def __call__(self, frame, event, arg):
                 try:
                     src = inspect.getsourcelines(frame)
                     line = src[lineno]
-                except IOError:
+                except OSError:
                     line = 'Unknown code named [%s].  VM instruction #%d' % (
                         frame.f_code.co_name, frame.f_lasti)
             if self.trace_names is None or name in self.trace_names:

gunicorn/errors.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

gunicorn/glogging.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
@@ -162,7 +161,7 @@ def parse_syslog_address(addr):
     return (socktype, (host, port))
 
 
-class Logger(object):
+class Logger:
 
     LOG_LEVELS = {
         "critical": logging.CRITICAL,

gunicorn/http/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

gunicorn/http/body.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
@@ -10,7 +9,7 @@
                                   InvalidChunkSize)
 
 
-class ChunkedReader(object):
+class ChunkedReader:
     def __init__(self, req, unreader):
         self.req = req
         self.parser = self.parse_chunked(unreader)
@@ -113,7 +112,7 @@ def get_data(self, unreader, buf):
         buf.write(data)
 
 
-class LengthReader(object):
+class LengthReader:
     def __init__(self, unreader, length):
         self.unreader = unreader
         self.length = length
@@ -143,7 +142,7 @@ def read(self, size):
         return ret
 
 
-class EOFReader(object):
+class EOFReader:
     def __init__(self, unreader):
         self.unreader = unreader
         self.buf = io.BytesIO()
@@ -181,7 +180,7 @@ def read(self, size):
         return ret
 
 
-class Body(object):
+class Body:
     def __init__(self, reader):
         self.reader = reader
         self.buf = io.BytesIO()

gunicorn/http/errors.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.

gunicorn/http/message.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
@@ -31,7 +30,7 @@
 RFC9110_5_5_INVALID_AND_DANGEROUS = re.compile(r"[\0\r\n]")
 
 
-class Message(object):
+class Message:
     def __init__(self, cfg, unreader, peer_addr):
         self.cfg = cfg
         self.unreader = unreader
@@ -376,13 +375,13 @@ def parse_proxy_protocol(self, line):
             try:
                 socket.inet_pton(socket.AF_INET, s_addr)
                 socket.inet_pton(socket.AF_INET, d_addr)
-            except socket.error:
+            except OSError:
                 raise InvalidProxyLine(line)
         elif proto == "TCP6":
             try:
                 socket.inet_pton(socket.AF_INET6, s_addr)
                 socket.inet_pton(socket.AF_INET6, d_addr)
-            except socket.error:
+            except OSError:
                 raise InvalidProxyLine(line)
 
         try:

gunicorn/http/parser.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -
 #
 # This file is part of gunicorn released under the MIT license.
 # See the NOTICE for more information.
@@ -7,7 +6,7 @@
 from gunicorn.http.unreader import SocketUnreader, IterUnreader
 
 
-class Parser(object):
+class Parser:
 
     mesg_class = None