summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authormaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 17:39:46 +0000
committermaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 17:39:46 +0000
commit72d1e597c85fbf6b45756e3c753696370c48c042 (patch)
treed01609d62295e34aa3a5721d4109f815d0fd23ad /net/tools
parent9475d1d189c03a0626c4855b38f6004bfe7c5bb8 (diff)
downloadchromium_src-72d1e597c85fbf6b45756e3c753696370c48c042.zip
chromium_src-72d1e597c85fbf6b45756e3c753696370c48c042.tar.gz
chromium_src-72d1e597c85fbf6b45756e3c753696370c48c042.tar.bz2
Slight code change to make some global variables const.
Fix >80 cols lines. Review URL: http://codereview.chromium.org/42013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rw-r--r--net/tools/testserver/testserver.py68
1 files changed, 46 insertions, 22 deletions
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 2d89733..407694a 100644
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -120,10 +120,16 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.EchoAllHandler,
self.EchoHandler] + self._get_handlers
- self._mime_types = { 'gif': 'image/gif', 'jpeg' : 'image/jpeg', 'jpg' : 'image/jpeg' }
+ self._mime_types = {
+ 'gif': 'image/gif',
+ 'jpeg' : 'image/jpeg',
+ 'jpg' : 'image/jpeg'
+ }
self._default_mime_type = 'text/html'
- BaseHTTPServer.BaseHTTPRequestHandler.__init__(self, request, client_address, socket_server)
+ BaseHTTPServer.BaseHTTPRequestHandler.__init__(self, request,
+ client_address,
+ socket_server)
def _ShouldHandleRequest(self, handler_name):
"""Determines if the path can be handled by the handler.
@@ -174,7 +180,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Content-type', 'text/html')
self.end_headers()
- self.wfile.write('<html><head><title>%s</title></head></html>' % time.time())
+ self.wfile.write('<html><head><title>%s</title></head></html>' %
+ time.time())
return True
@@ -190,7 +197,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Content-type', 'text/html')
self.end_headers()
- self.wfile.write('<html><head><title>%s</title></head></html>' % time.time())
+ self.wfile.write('<html><head><title>%s</title></head></html>' %
+ time.time())
return True
@@ -206,7 +214,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Content-type', 'text/html')
self.end_headers()
- self.wfile.write('<html><head><title>%s</title></head></html>' % time.time())
+ self.wfile.write('<html><head><title>%s</title></head></html>' %
+ time.time())
return True
@@ -222,7 +231,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Content-type', 'text/html')
self.end_headers()
- self.wfile.write('<html><head><title>%s</title></head></html>' % time.time())
+ self.wfile.write('<html><head><title>%s</title></head></html>' %
+ time.time())
return True
@@ -238,7 +248,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Cache-Control', 'max-age=60, proxy-revalidate')
self.end_headers()
- self.wfile.write('<html><head><title>%s</title></head></html>' % time.time())
+ self.wfile.write('<html><head><title>%s</title></head></html>' %
+ time.time())
return True
@@ -254,7 +265,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Cache-Control', 'max-age=5, private')
self.end_headers()
- self.wfile.write('<html><head><title>%s</title></head></html>' % time.time())
+ self.wfile.write('<html><head><title>%s</title></head></html>' %
+ time.time())
return True
@@ -270,7 +282,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Cache-Control', 'max-age=5, public')
self.end_headers()
- self.wfile.write('<html><head><title>%s</title></head></html>' % time.time())
+ self.wfile.write('<html><head><title>%s</title></head></html>' %
+ time.time())
return True
@@ -286,7 +299,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Cache-Control', 'public, s-maxage = 60, max-age = 0')
self.end_headers()
- self.wfile.write('<html><head><title>%s</title></head></html>' % time.time())
+ self.wfile.write('<html><head><title>%s</title></head></html>' %
+ time.time())
return True
@@ -302,7 +316,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Cache-Control', 'must-revalidate')
self.end_headers()
- self.wfile.write('<html><head><title>%s</title></head></html>' % time.time())
+ self.wfile.write('<html><head><title>%s</title></head></html>' %
+ time.time())
return True
@@ -319,7 +334,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Cache-Control', 'max-age=60, must-revalidate')
self.end_headers()
- self.wfile.write('<html><head><title>%s</title></head></html>' % time.time())
+ self.wfile.write('<html><head><title>%s</title></head></html>' %
+ time.time())
return True
@@ -335,7 +351,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Cache-Control', 'no-store')
self.end_headers()
- self.wfile.write('<html><head><title>%s</title></head></html>' % time.time())
+ self.wfile.write('<html><head><title>%s</title></head></html>' %
+ time.time())
return True
@@ -352,7 +369,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Cache-Control', 'max-age=60, no-store')
self.end_headers()
- self.wfile.write('<html><head><title>%s</title></head></html>' % time.time())
+ self.wfile.write('<html><head><title>%s</title></head></html>' %
+ time.time())
return True
@@ -370,7 +388,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_header('Cache-Control', 'no-transform')
self.end_headers()
- self.wfile.write('<html><head><title>%s</title></head></html>' % time.time())
+ self.wfile.write('<html><head><title>%s</title></head></html>' %
+ time.time())
return True
@@ -730,12 +749,14 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
# the request URL into this, but we don't care for testing.
nonce_life = 10
stale = False
- if not self.server.nonce or (time.time() - self.server.nonce_time > nonce_life):
+ if (not self.server.nonce or
+ (time.time() - self.server.nonce_time > nonce_life)):
if self.server.nonce:
stale = True
self.server.nonce_time = time.time()
self.server.nonce = \
- _new_md5(time.ctime(self.server.nonce_time) + 'privatekey').hexdigest()
+ _new_md5(time.ctime(self.server.nonce_time) +
+ 'privatekey').hexdigest()
nonce = self.server.nonce
opaque = _new_md5('opaque').hexdigest()
@@ -760,7 +781,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
# Check the 'response' value and make sure it matches our magic hash.
# See http://www.ietf.org/rfc/rfc2617.txt
- hash_a1 = _new_md5(':'.join([pairs['username'], realm, password])).hexdigest()
+ hash_a1 = _new_md5(
+ ':'.join([pairs['username'], realm, password])).hexdigest()
hash_a2 = _new_md5(':'.join([self.command, pairs['uri']])).hexdigest()
if 'qop' in pairs and 'nc' in pairs and 'cnonce' in pairs:
response = _new_md5(':'.join([hash_a1, nonce, pairs['nc'],
@@ -845,7 +867,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
def ServerRedirectHandler(self):
"""Sends a server redirect to the given URL. The syntax is
- '/server-redirect?http://foo.bar/asdf' to redirect to 'http://foo.bar/asdf'"""
+ '/server-redirect?http://foo.bar/asdf' to redirect to
+ 'http://foo.bar/asdf'"""
test_name = "/server-redirect"
if not self._ShouldHandleRequest(test_name):
@@ -868,7 +891,8 @@ class TestPageHandler(BaseHTTPServer.BaseHTTPRequestHandler):
def ClientRedirectHandler(self):
"""Sends a client redirect to the given URL. The syntax is
- '/client-redirect?http://foo.bar/asdf' to redirect to 'http://foo.bar/asdf'"""
+ '/client-redirect?http://foo.bar/asdf' to redirect to
+ 'http://foo.bar/asdf'"""
test_name = "/client-redirect"
if not self._ShouldHandleRequest(test_name):
@@ -1045,7 +1069,8 @@ def main(options, args):
pyftpdlib.ftpserver.logline = line_logger
# Define a customized banner (string returned when client connects)
- ftp_handler.banner = "pyftpdlib %s based ftpd ready." % pyftpdlib.ftpserver.__ver__
+ ftp_handler.banner = ("pyftpdlib %s based ftpd ready." %
+ pyftpdlib.ftpserver.__ver__)
# Instantiate FTP server class and listen to 127.0.0.1:port
address = ('127.0.0.1', port)
@@ -1075,4 +1100,3 @@ if __name__ == '__main__':
options, args = option_parser.parse_args()
sys.exit(main(options, args))
-
generated by cgit v1.1 at 2025-03-12 07:46:36 +0000