Kaydet (Commit) d4294175 authored tarafından Amaury Forgeot d'Arc's avatar Amaury Forgeot d'Arc

#4363: Let uuid.uuid1() and uuid.uuid4() run even if the ctypes module is not present.

Will backport to 2.6
üst 32265659
...@@ -479,8 +479,8 @@ def uuid1(node=None, clock_seq=None): ...@@ -479,8 +479,8 @@ 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:
_buffer = ctypes.create_string_buffer(16)
_uuid_generate_time(_buffer) _uuid_generate_time(_buffer)
return UUID(bytes=_buffer.raw) return UUID(bytes=_buffer.raw)
...@@ -516,8 +516,8 @@ def uuid4(): ...@@ -516,8 +516,8 @@ 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:
_buffer = ctypes.create_string_buffer(16)
_uuid_generate_random(_buffer) _uuid_generate_random(_buffer)
return UUID(bytes=_buffer.raw) return UUID(bytes=_buffer.raw)
......
...@@ -50,6 +50,9 @@ Core and Builtins ...@@ -50,6 +50,9 @@ Core and Builtins
Library Library
------- -------
- Issue #4363: The uuid.uuid1() and uuid.uuid4() functions now work even if
the ctypes module is not present.
- Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__. - Issue #4116: Resolve member name conflict in ScrolledCanvas.__init__.
- httplib.HTTPConnection.putheader() now accepts an arbitrary number of values - httplib.HTTPConnection.putheader() now accepts an arbitrary number of values
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment