Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(775)

Unified Diff: net/tools/testserver/testserver.py

Issue 6591051: Remove bzip2-encoded data file left behind when bzip2 support was removed in r34047. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove related code from testserver.py Created 9 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/data/filter_unittests/google.txt.bz2 ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/testserver/testserver.py
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 871e540f8d272e5b69ed949ed0751dcf671a07dc..a22255802ce53738c4c78d19f99a0c8e24297e70 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -281,8 +281,6 @@ class TestPageHandler(BasePageHandler):
self.EchoHeaderOverride,
self.EchoAllHandler,
self.FileHandler,
- self.RealFileWithCommonHeaderHandler,
- self.RealBZ2FileWithCommonHeaderHandler,
self.SetCookieHandler,
self.AuthBasicHandler,
self.AuthDigestHandler,
@@ -829,78 +827,6 @@ class TestPageHandler(BasePageHandler):
return True
- def RealFileWithCommonHeaderHandler(self):
- """This handler sends the contents of the requested file without the pseudo
- http head!"""
-
- prefix='/realfiles/'
- if not self.path.startswith(prefix):
- return False
-
- file = self.path[len(prefix):]
- path = os.path.join(self.server.data_dir, file)
-
- try:
- f = open(path, "rb")
- data = f.read()
- f.close()
-
- # just simply set the MIME as octal stream
- self.send_response(200)
- self.send_header('Content-type', 'application/octet-stream')
- self.end_headers()
-
- self.wfile.write(data)
- except:
- self.send_error(404)
-
- return True
-
- def RealBZ2FileWithCommonHeaderHandler(self):
- """This handler sends the bzip2 contents of the requested file with
- corresponding Content-Encoding field in http head!"""
-
- prefix='/realbz2files/'
- if not self.path.startswith(prefix):
- return False
-
- parts = self.path.split('?')
- file = parts[0][len(prefix):]
- path = os.path.join(self.server.data_dir, file) + '.bz2'
-
- if len(parts) > 1:
- options = parts[1]
- else:
- options = ''
-
- try:
- self.send_response(200)
- accept_encoding = self.headers.get("Accept-Encoding")
- if accept_encoding.find("bzip2") != -1:
- f = open(path, "rb")
- data = f.read()
- f.close()
- self.send_header('Content-Encoding', 'bzip2')
- self.send_header('Content-type', 'application/x-bzip2')
- self.end_headers()
- if options == 'incremental-header':
- self.wfile.write(data[:1])
- self.wfile.flush()
- time.sleep(1.0)
- self.wfile.write(data[1:])
- else:
- self.wfile.write(data)
- else:
- """client do not support bzip2 format, send pseudo content
- """
- self.send_header('Content-type', 'text/html; charset=ISO-8859-1')
- self.end_headers()
- self.wfile.write("you do not support bzip2 encoding")
- except:
- self.send_error(404)
-
- return True
-
def SetCookieHandler(self):
"""This handler just sets a cookie, for testing cookie handling."""
« no previous file with comments | « net/data/filter_unittests/google.txt.bz2 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698