Remove Python < 2.6 compatibility imports from testserver.py.

net/tools/testserver/testserver.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This is a simple HTTP/FTP/SYNC/TCP/UDP/ server used for testing Chrome.
 
 It supports several test URLs, as specified by the handlers in TestPageHandler.
 By default, it listens on an ephemeral port and sends the port number back to
 the originating process over a pipe. The originating process can specify an
 explicit port if necessary.
 It can use https if you specify the flag --https=CERT where CERT is the path
 to a pem file containing the certificate and private key that should be used.
 """
 
 import asyncore
 import base64
 import BaseHTTPServer
 import cgi
 import errno
+import hashlib
 import httplib
+import json
 import minica
 import optparse
 import os
 import random
 import re
 import select
 import socket
 import SocketServer
 import struct
 import sys
 import threading
 import time
 import urllib
 import urlparse
 import warnings
 import zlib
 
 # Ignore deprecation warnings, they make our output more cluttered.
 warnings.filterwarnings("ignore", category=DeprecationWarning)

[M-A Ruel, 2012/09/14 23:16:08]

Maybe it's not necessary anymore ?

[mattm, 2012/09/14 23:21:48]

Seems like it.

I don't want to introduce extra variables in the equation though, so I'll remove
that in a separate CL if this sticks.

 
 import echo_message
 import pyftpdlib.ftpserver
 import tlslite
 import tlslite.api
 
-try:
-  import hashlib
-  _new_md5 = hashlib.md5
-except ImportError:
-  import md5
-  _new_md5 = md5.new
-
-try:
-  import json
-except ImportError:
-  import simplejson as json
-
 if sys.platform == 'win32':
   import msvcrt
 
 SERVER_HTTP = 0
 SERVER_FTP = 1
 SERVER_SYNC = 2
 SERVER_TCP_ECHO = 3
 SERVER_UDP_ECHO = 4
 SERVER_BASIC_AUTH_PROXY = 5
 
@@ skipping 1242 matching lines @@
    This is a fake implementation. A real implementation would only use a given
    nonce a single time (hence the name n-once). However, for the purposes of
    unittesting, we don't care about the security of the nonce.
 
    Args:
      force_reset: Iff set, the nonce will be changed. Useful for testing the
          "stale" response.
    """
    if force_reset or not self.server.nonce_time:
      self.server.nonce_time = time.time()
-   return _new_md5('privatekey%s%d' %
+   return hashlib.md5('privatekey%s%d' %
                    (self.path, self.server.nonce_time)).hexdigest()
 
   def AuthDigestHandler(self):
     """This handler tests 'Digest' authentication.
 
     It just sends a page with title 'user/pass' if you succeed.
 
     A stale response is sent iff "stale" is present in the request path.
     """
     if not self._ShouldHandleRequest("/auth-digest"):
       return False
 
     stale = 'stale' in self.path
     nonce = self.GetNonce(force_reset=stale)
-    opaque = _new_md5('opaque').hexdigest()
+    opaque = hashlib.md5('opaque').hexdigest()
     password = 'secret'
     realm = 'testrealm'
 
     auth = self.headers.getheader('authorization')
     pairs = {}
     try:
       if not auth:
         raise Exception('no auth')
       if not auth.startswith('Digest'):
         raise Exception('not digest')
       # Pull out all the name="value" pairs as a dictionary.
       pairs = dict(re.findall(r'(\b[^ ,=]+)="?([^",]+)"?', auth))
 
       # Make sure it's all valid.
       if pairs['nonce'] != nonce:
         raise Exception('wrong nonce')
       if pairs['opaque'] != opaque:
         raise Exception('wrong opaque')
 
       # Check the 'response' value and make sure it matches our magic hash.
       # See http://www.ietf.org/rfc/rfc2617.txt
-      hash_a1 = _new_md5(
+      hash_a1 = hashlib.md5(
           ':'.join([pairs['username'], realm, password])).hexdigest()
-      hash_a2 = _new_md5(':'.join([self.command, pairs['uri']])).hexdigest()
+      hash_a2 = hashlib.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'],
+        response = hashlib.md5(':'.join([hash_a1, nonce, pairs['nc'],
             pairs['cnonce'], pairs['qop'], hash_a2])).hexdigest()
       else:
-        response = _new_md5(':'.join([hash_a1, nonce, hash_a2])).hexdigest()
+        response = hashlib.md5(':'.join([hash_a1, nonce, hash_a2])).hexdigest()
 
       if pairs['response'] != response:
         raise Exception('wrong password')
     except Exception, e:
       # Authentication failed.
       self.send_response(401)
       hdr = ('Digest '
              'realm="%s", '
              'domain="/", '
              'qop="auth", '
@@ skipping 1029 matching lines @@
                            dest='host',
                            help='Hostname or IP upon which the server will '
                            'listen. Client connections will also only be '
                            'allowed from this address.')
   option_parser.add_option('', '--auth-token', dest='auth_token',
                            help='Specify the auth token which should be used'
                            'in the authorization header for GData.')
   options, args = option_parser.parse_args()
 
   sys.exit(main(options, args))