From da211e7383868d519e1f8e3128769176dce14845 Mon Sep 17 00:00:00 2001 From: jtittsler Date: Sat, 12 Jun 2010 22:37:15 +0000 Subject: pull md5 from hashlib if available git-svn-id: https://exe.svn.sourceforge.net/svnroot/exe/trunk@3599 38b22f21-9aea-0310-abfc-843a9883df58 --- 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__) -- cgit v0.9.1