setup for python-2.6 avoid depreciation warnings

builder/kojid

@@ -33,7 +33,7 @@ import errno
 import glob
 import logging
 import logging.handlers
-import md5
+from koji.util import md5_constructor
 import os
 import pprint
 import pwd

cli/koji

@@ -31,7 +31,7 @@ import base64
 import koji
 import koji.util
 import fnmatch
-import md5
+from koji.util import md5_constructor
 import os
 import re
 import pprint

hub/kojihub.py

@@ -33,7 +33,7 @@ import logging
 import logging.handlers
 import fcntl
 import fnmatch
-import md5
+from koji.util import md5_constructor
 import os
 import pgdb
 import random

koji/__init__.py

@@ -31,7 +31,7 @@ import datetime
 from fnmatch import fnmatch
 import logging
 import logging.handlers
-import md5
+from koji.util import md5_constructor
 import os
 import os.path
 import pwd

koji/util.py

@@ -19,6 +19,11 @@ import re
 import time
 import koji
 
+try:
+    from hashlib import md5 as md5_constructor
+except ImportError:
+    from md5 import new as md5_constructor
+
 def _changelogDate(cldate):
     return time.strftime('%a %b %d %Y', time.strptime(koji.formatTime(cldate), '%Y-%m-%d %H:%M:%S'))
 

www/kojiweb/index.py

@@ -8,7 +8,7 @@ import Cheetah.Filters
 import Cheetah.Template
 import datetime
 import time
-import md5
+from koji.util import md5_constructor
 import koji
 import kojiweb.util
 from kojiweb.util import _initValues

www/lib/kojiweb/util.py

@@ -1,7 +1,7 @@
 import Cheetah.Template
 import datetime
 import koji
-import md5
+from koji.util import md5_constructor
 import os
 import time
 #a bunch of exception classes that explainError needs