summaryrefslogtreecommitdiff
path: root/paste/session.py
diff options
context:
space:
mode:
authorpjenvey <devnull@localhost>2008-09-17 22:18:35 +0000
committerpjenvey <devnull@localhost>2008-09-17 22:18:35 +0000
commit53e7d3ce846eaf9546b0a413c2921627138ecc45 (patch)
tree793b0ba4f7bafcbf7444b5eec976bc72bf0a9739 /paste/session.py
parent12512c9ad73e4352351f84be7ee0259f023597ef (diff)
downloadpaste-53e7d3ce846eaf9546b0a413c2921627138ecc45.tar.gz
prefer hashlib over the md5/sha modules which are deprecated in Python 2.6
Diffstat (limited to 'paste/session.py')
-rw-r--r--paste/session.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/paste/session.py b/paste/session.py
index 5f57b92..16a7739 100644
--- a/paste/session.py
+++ b/paste/session.py
@@ -27,7 +27,6 @@ from Cookie import SimpleCookie
import time
import random
import os
-import md5
import datetime
import threading
import tempfile
@@ -36,6 +35,10 @@ try:
import cPickle
except ImportError:
import pickle as cPickle
+try:
+ from hashlib import md5
+except ImportError:
+ from md5 import md5
from paste import wsgilib
from paste import request
@@ -139,7 +142,7 @@ class SessionFactory(object):
r.append(os.times())
if for_object is not None:
r.append(id(for_object))
- md5_hash = md5.new(str(r))
+ md5_hash = md5(str(r))
try:
return md5_hash.hexdigest()
except AttributeError: