dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made new web2py_uuid working on python 2.5

Browse Source
This commit is contained in:
mdipierro
2012-09-29 18:35:09 -05:00
parent 0b4df40f60
commit 0c2d0178db
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.9 (2012-09-29 17:56:36) dev Version 2.0.9 (2012-09-29 18:35:01) dev
gluon/utils.py
+2 -2
View File
@@ -157,8 +157,8 @@ def web2py_uuid(ctokens=UNPACKED_CTOKENS):
It works like uuid.uuid4 except that tries to use os.urandom() if possible It works like uuid.uuid4 except that tries to use os.urandom() if possible
and it XORs the output with the tokens uniquely associated with this machine. and it XORs the output with the tokens uniquely associated with this machine.
""" """
rand_longs = struct.unpack('=QQ', bytes(bytearray( rand_longs = struct.unpack('=QQ', string.join(
random.randrange(256) for i in xrange(16)))) (chr(random.randrange(256)) for i in xrange(16)),''))
if HAVE_URANDOM: if HAVE_URANDOM:
urand_longs = struct.unpack('=QQ', fast_urandom16()) urand_longs = struct.unpack('=QQ', fast_urandom16())
byte_s = struct.pack('=QQ', byte_s = struct.pack('=QQ',