mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Make uuid.py thread-safe. Fix by Yuri Ginsburg.

Browse source
This commit is contained in:
Guido van Rossum 2007-08-24 04:13:42 +00:00
parent fd53fd62c9
commit 37410aa044
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/uuid.py
View file

@ -414,7 +414,6 @@ def _netbios_getnode():
_uuid_generate_random = _uuid_generate_time = _UuidCreate = None _uuid_generate_random = _uuid_generate_time = _UuidCreate = None
try: try:
import ctypes, ctypes.util import ctypes, ctypes.util
_buffer = ctypes.create_string_buffer(16)
# The uuid_generate_* routines are provided by libuuid on at least # The uuid_generate_* routines are provided by libuuid on at least
# Linux and FreeBSD, and provided by libc on Mac OS X. # Linux and FreeBSD, and provided by libc on Mac OS X.
@ -447,11 +446,13 @@ except:
def _unixdll_getnode(): def _unixdll_getnode():
"""Get the hardware address on Unix using ctypes.""" """Get the hardware address on Unix using ctypes."""
_buffer = ctypes.create_string_buffer(16)
_uuid_generate_time(_buffer) _uuid_generate_time(_buffer)
return UUID(bytes=bytes_(_buffer.raw)).node return UUID(bytes=bytes_(_buffer.raw)).node
def _windll_getnode(): def _windll_getnode():
"""Get the hardware address on Windows using ctypes.""" """Get the hardware address on Windows using ctypes."""
_buffer = ctypes.create_string_buffer(16)
if _UuidCreate(_buffer) == 0: if _UuidCreate(_buffer) == 0:
return UUID(bytes=bytes_(_buffer.raw)).node return UUID(bytes=bytes_(_buffer.raw)).node
@ -499,6 +500,7 @@ def uuid1(node=None, clock_seq=None):
# When the system provides a version-1 UUID generator, use it (but don't # When the system provides a version-1 UUID generator, use it (but don't
# use UuidCreate here because its UUIDs don't conform to RFC 4122). # use UuidCreate here because its UUIDs don't conform to RFC 4122).
_buffer = ctypes.create_string_buffer(16)
if _uuid_generate_time and node is clock_seq is None: if _uuid_generate_time and node is clock_seq is None:
_uuid_generate_time(_buffer) _uuid_generate_time(_buffer)
return UUID(bytes=bytes_(_buffer.raw)) return UUID(bytes=bytes_(_buffer.raw))
@ -535,6 +537,7 @@ def uuid4():
"""Generate a random UUID.""" """Generate a random UUID."""
# When the system provides a version-4 UUID generator, use it. # When the system provides a version-4 UUID generator, use it.
_buffer = ctypes.create_string_buffer(16)
if _uuid_generate_random: if _uuid_generate_random:
_uuid_generate_random(_buffer) _uuid_generate_random(_buffer)
return UUID(bytes=bytes_(_buffer.raw)) return UUID(bytes=bytes_(_buffer.raw))