[jhbuild/desktop-testing] [ldtp] Fix md5 import warning
- From: John Carr <johncarr src gnome org>
- To: svn-commits-list gnome org
- Subject: [jhbuild/desktop-testing] [ldtp] Fix md5 import warning
- Date: Wed, 20 May 2009 05:19:52 -0400 (EDT)
commit f01b2354cfb7772ec2a9c0e52761629703bd2571
Author: John Carr <john carr unrouted co uk>
Date: Wed May 20 09:32:14 2009 +0100
[ldtp] Fix md5 import warning
---
jhbuild/utils/xvfb.py | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/jhbuild/utils/xvfb.py b/jhbuild/utils/xvfb.py
index 8d91b03..05860f3 100644
--- a/jhbuild/utils/xvfb.py
+++ b/jhbuild/utils/xvfb.py
@@ -22,7 +22,11 @@
# Heavily based on testmodule.py (FIXME: Proper attribution of GSOC student)
-import os, sys, subprocess, signal, random, md5, tempfile, time
+import os, sys, subprocess, signal, random, tempfile, time
+try:
+ from hashlib import md5
+except ImportError:
+ import md5
from jhbuild.errors import FatalError
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]