From d971f7f54bc75ef45ed83d05c932529bc0bb209b Mon Sep 17 00:00:00 2001
From: "maruel@chromium.org"
 <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 1 May 2009 12:51:23 +0000
Subject: [PATCH] Load hashlib when available and md5 otherwise. Review URL:
 http://codereview.chromium.org/99235

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@15043 0039d316-1c4b-4281-b951-d872f2087c98
---
 upload.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/upload.py b/upload.py
index 3131b3119..1a87ad2ca 100755
--- a/upload.py
+++ b/upload.py
@@ -34,7 +34,6 @@ against by using the '--rev' option.
 import cookielib
 import getpass
 import logging
-import md5
 import mimetypes
 import optparse
 import os
@@ -46,6 +45,14 @@ import urllib
 import urllib2
 import urlparse
 
+# Work-around for md5 module deprecation warning in python 2.5+:
+try: 
+  # Try to load hashlib (python 2.5+)
+  from hashlib import md5
+except ImportError:
+  # If hashlib cannot be imported, load md5.new instead.
+  from md5 import new as md5
+
 try:
   import readline
 except ImportError:
@@ -675,7 +682,7 @@ class VersionControlSystem(object):
                (type, filename))
         file_too_large = True
         content = ""
-      checksum = md5.new(content).hexdigest()
+      checksum = md5(content).hexdigest()
       if options.verbose > 0 and not file_too_large:
         print "Uploading %s file for %s" % (type, filename)
       url = "/%d/upload_content/%d/%d" % (int(issue), int(patchset), file_id)
@@ -1313,7 +1320,7 @@ def RealMain(argv, data=None):
   base_hashes = ""
   for file, info in files.iteritems():
     if not info[0] is None:
-      checksum = md5.new(info[0]).hexdigest()
+      checksum = md5(info[0]).hexdigest()
       if base_hashes:
         base_hashes += "|"
       base_hashes += checksum + ":" + file