Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed some type checks in the development server. Fixed #6063.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 4262765649014b58b6e07c1934f970aa7da9e5d6 1 parent 8de4ed9
@malcolmt malcolmt authored
Showing with 6 additions and 7 deletions.
  1. +6 −7 django/core/servers/basehttp.py
View
13 django/core/servers/basehttp.py
@@ -8,7 +8,6 @@
"""
from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
-from types import ListType, StringType
import mimetypes
import os
import re
@@ -72,7 +71,7 @@ def _formatparam(param, value=None, quote=1):
class Headers(object):
"""Manage a collection of HTTP response headers"""
def __init__(self,headers):
- if type(headers) is not ListType:
+ if not isinstance(headers, list):
raise TypeError("Headers must be a list of name/value tuples")
self._headers = headers
@@ -327,7 +326,7 @@ def set_content_length(self):
"""Compute Content-Length or switch to chunked encoding if possible"""
try:
blocks = len(self.result)
- except (TypeError,AttributeError,NotImplementedError):
+ except (TypeError, AttributeError, NotImplementedError):
pass
else:
if blocks==1:
@@ -356,14 +355,14 @@ def start_response(self, status, headers,exc_info=None):
elif self.headers is not None:
raise AssertionError("Headers already set!")
- assert type(status) is StringType,"Status must be a string"
+ assert isinstance(status, str),"Status must be a string"
assert len(status)>=4,"Status must be at least 4 characters"
assert int(status[:3]),"Status message must begin w/3-digit code"
assert status[3]==" ", "Status message must have a space after code"
if __debug__:
for name,val in headers:
- assert type(name) is StringType,"Header names must be strings"
- assert type(val) is StringType,"Header values must be strings"
+ assert isinstance(name, str),"Header names must be strings"
+ assert isinstance(val, str),"Header values must be strings"
assert not is_hop_by_hop(name),"Hop-by-hop headers not allowed"
self.status = status
self.headers = self.headers_class(headers)
@@ -386,7 +385,7 @@ def send_preamble(self):
def write(self, data):
"""'write()' callable as specified by PEP 333"""
- assert type(data) is StringType,"write() argument must be string"
+ assert isinstance(data, str), "write() argument must be string"
if not self.status:
raise AssertionError("write() before start_response()")

0 comments on commit 4262765

Please sign in to comment.
Something went wrong with that request. Please try again.