summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Pelme <andreas@pelme.se>2015-01-02 12:58:22 +0100
committerTim Graham <timograham@gmail.com>2015-01-02 08:51:28 -0500
commit4ee06ec3fc8e94d164afbd2f9c880c60c658a9ac (patch)
tree18ce314c41df5635e5422d4003fb5d09db31ffc4
parent40ccef16cb699ff66a9d4163cc195c3a3b28c5ba (diff)
Fixed #24069 -- Made ServerHandler a new style class to fix super() call.
-rw-r--r--django/core/servers/basehttp.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py
index 5af226f31f..600d9eb32a 100644
--- a/django/core/servers/basehttp.py
+++ b/django/core/servers/basehttp.py
@@ -87,7 +87,8 @@ class WSGIServer(simple_server.WSGIServer, object):
super(WSGIServer, self).handle_error(request, client_address)
-class ServerHandler(simple_server.ServerHandler):
+# Inheriting from object required on Python 2.
+class ServerHandler(simple_server.ServerHandler, object):
def handle_error(self):
# Ignore broken pipe errors, otherwise pass on
if not is_broken_pipe_error():