summaryrefslogtreecommitdiff
path: root/django/core/servers/basehttp.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/core/servers/basehttp.py')
-rw-r--r--django/core/servers/basehttp.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py
index f3dc6915d2..64ed739473 100644
--- a/django/core/servers/basehttp.py
+++ b/django/core/servers/basehttp.py
@@ -309,7 +309,7 @@ class ServerHandler(object):
"""
if not self.result_is_file() and not self.sendfile():
for data in self.result:
- self.write(data, False)
+ self.write(data)
self.finish_content()
self.close()
@@ -377,7 +377,7 @@ class ServerHandler(object):
else:
self._write('Status: %s\r\n' % self.status)
- def write(self, data, flush=True):
+ def write(self, data):
"""'write()' callable as specified by PEP 333"""
assert type(data) is StringType,"write() argument must be string"
@@ -394,8 +394,7 @@ class ServerHandler(object):
# XXX check Content-Length and truncate if too many bytes written?
self._write(data)
- if flush:
- self._flush()
+ self._flush()
def sendfile(self):
"""Platform-specific file transmission
@@ -422,6 +421,8 @@ class ServerHandler(object):
if not self.headers_sent:
self.headers['Content-Length'] = "0"
self.send_headers()
+ else:
+ pass # XXX check if content-length was too short?
def close(self):
try: