# HG changeset patch # User Sylvain Thénault # Date 1278342131 -7200 # Node ID a0eb685dfe7a663ad0460ab90f873f56a82abd80 # Parent 7ef636d24ab2643b17120af756d1d14ce35f852b [req] hashlib has no hash function, but has an hash1 function even in python 2.5 diff -r 7ef636d24ab2 -r a0eb685dfe7a web/request.py --- a/web/request.py Fri Jul 02 14:47:34 2010 +0200 +++ b/web/request.py Mon Jul 05 17:02:11 2010 +0200 @@ -20,12 +20,7 @@ __docformat__ = "restructuredtext en" import Cookie -try: - import hashlib - hashlib.hash -except AttributeError: - # python 2.5 ... - import sha as hashlib +import hashlib import time import random import base64 @@ -364,9 +359,9 @@ def register_onetime_callback(self, func, *args): cbname = 'cb_%s' % ( - hashlib.sha('%s%s%s%s' % (time.time(), func.__name__, - random.random(), - self.user.login)).hexdigest()) + hashlib.sha1('%s%s%s%s' % (time.time(), func.__name__, + random.random(), + self.user.login)).hexdigest()) def _cb(req): try: ret = func(req, *args)