Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjtittsler <jtittsler@38b22f21-9aea-0310-abfc-843a9883df58>2010-06-12 22:37:15 (GMT)
committer jtittsler <jtittsler@38b22f21-9aea-0310-abfc-843a9883df58>2010-06-12 22:37:15 (GMT)
commitda211e7383868d519e1f8e3128769176dce14845 (patch)
tree1527c5f532223b343d99f624e216849dfcdc1a29
parent10a05223a75b06e3e31f64e6ace2678ab81ddb29 (diff)
pull md5 from hashlib if available
git-svn-id: https://exe.svn.sourceforge.net/svnroot/exe/trunk@3599 38b22f21-9aea-0310-abfc-843a9883df58
-rw-r--r--exe/engine/path.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/exe/engine/path.py b/exe/engine/path.py
index 41207fb..29ab33d 100644
--- a/exe/engine/path.py
+++ b/exe/engine/path.py
@@ -32,7 +32,11 @@ Date: 7 Mar 2004
from __future__ import generators
-import sys, os, fnmatch, glob, shutil, codecs, md5
+import sys, os, fnmatch, glob, shutil, codecs
+try:
+ from hashlib import md5
+except ImportError:
+ from md5 import md5
from tempfile import mkdtemp
import logging
log = logging.getLogger(__name__)