fixes for python 2.6 warnings in the testserver.

net/tools/testserver/testserver.py

 #!/usr/bin/python2.4
 # Copyright (c) 2006-2008 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 server used for testing Chrome.
 
 It supports several test URLs, as specified by the handlers in TestPageHandler.
 It defaults to living on localhost:8888.
 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.
 To shut it down properly, visit localhost:8888/kill.
 """
 
 import base64
 import BaseHTTPServer
 import cgi
-import md5
 import optparse
 import os
 import re
 import shutil
 import SocketServer
 import sys
 import time
 import tlslite
 import tlslite.api
 import pyftpdlib.ftpserver
 
+try:
+  import hashlib
+  _new_md5 = hashlib.md5
+except ImportError:
+  import md5
+  _new_md5 = md5.new
+
 SERVER_HTTP = 0
 SERVER_FTP = 1
 
 debug_output = sys.stderr
 def debug(str):
   debug_output.write(str + "\n")
   debug_output.flush()
 
 class StoppableHTTPServer(BaseHTTPServer.HTTPServer):
   """This is a specialization of of BaseHTTPServer to allow it
@@ skipping 682 matching lines @@
 
     # Periodically generate a new nonce.  Technically we should incorporate
     # 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 self.server.nonce:
         stale = True
       self.server.nonce_time = time.time()
       self.server.nonce = \
-          md5.new(time.ctime(self.server.nonce_time) + 'privatekey').hexdigest()
+          _new_md5(time.ctime(self.server.nonce_time) + 'privatekey').hexdigest()
 
     nonce = self.server.nonce
-    opaque = md5.new('opaque').hexdigest()
+    opaque = _new_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 = md5.new(':'.join([pairs['username'], realm, password])).hexdigest()
-      hash_a2 = md5.new(':'.join([self.command, pairs['uri']])).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 = md5.new(':'.join([hash_a1, nonce, pairs['nc'],
+        response = _new_md5(':'.join([hash_a1, nonce, pairs['nc'],
             pairs['cnonce'], pairs['qop'], hash_a2])).hexdigest()
       else:
-        response = md5.new(':'.join([hash_a1, nonce, hash_a2])).hexdigest()
+        response = _new_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 289 matching lines @@
   option_parser.add_option('', '--data-dir', dest='data_dir',
                            help='Directory from which to read the files')
   option_parser.add_option('', '--https', dest='cert',
                            help='Specify that https should be used, specify '
                            'the path to the cert containing the private key '
                            'the server should use')
   options, args = option_parser.parse_args()
 
   sys.exit(main(options, args))