openrpg-hg/cherrypy.patch

   1 --- plugins/cherrypy/_cphttptools.py.orig       2009-05-17 00:58:16.000000000 -0700
   2 +++ plugins/cherrypy/_cphttptools.py    2009-05-17 00:57:00.000000000 -0700
   3 @@ -27,7 +27,8 @@
   4  """
   5
   6  import cpg, urllib, sys, time, traceback, types, StringIO, cgi, os
   7 -import mimetypes, sha, random, string, _cputil, cperror, Cookie, urlparse
   8 +import mimetypes, random, string, _cputil, cperror, Cookie, urlparse
   9 +from hashlib import sha1
  10  from lib.filter import basefilter
  11
  12  """
  13 @@ -418,7 +419,7 @@
  14      for i in range(50):
  15          s += random.choice(string.letters+string.digits)
  16      s += '%s'%time.time()
  17 -    return sha.sha(s).hexdigest()
  18 +    return sha1(s).hexdigest()
  19
  20  def getObjFromPath(objPathList, objCache):
  21      """ For a given objectPathList (like ['root', 'a', 'b', 'index']),