Skip to content

add support for parsing strings into UUID objects #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add support for parsing strings into UUID objects #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions libuuid/_uuid.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,38 @@ cdef extern from "Python.h":


class FastUUID(uuid_std.UUID):
def __init__(self, version=4, *args, **kwargs):

def __init__(self, uuid_str=None, int version=4, *args, **kwargs):

cdef object buf = PyString_FromStringAndSize(NULL, 16)
cdef unsigned char *_bytes = <unsigned char*>PyString_AS_STRING(buf)
if version == 1:
uuid_generate_time(_bytes)
elif version == 4:
uuid_generate_random(_bytes)

if uuid_str:
uuid_parse(uuid_str, _bytes)
else:
if version == 1:
uuid_generate_time(_bytes)
elif version == 4:
uuid_generate_random(_bytes)

self.__dict__['bytes'] = buf
self.__dict__['int'] = _PyLong_FromByteArray(_bytes, 16, 0, 0)

def get_bytes(self):
return self.bytes


def parse_many(uuid_strings):
uuids = []
for uuid_str in uuid_strings:
uuids.append(FastUUID(uuid_str))
return uuids


def uuid1(node=None, clock_seq=None):
if node or clock_seq:
raise NotImplementedError, "node and clock_seq are not supported in libuuid"
return FastUUID(1)
return FastUUID(version=1)

uuid3 = uuid_std.uuid3

Expand Down
6 changes: 6 additions & 0 deletions tests/test_uuid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ def _check_constant(const):

class TestUUID(unittest.TestCase):

def test_uuid_parse(self):
u = libuuid.FastUUID('d7cfb958-8cb5-477c-b7ec-80ecaf1c8d67')
u2 = uuid.UUID('d7cfb958-8cb5-477c-b7ec-80ecaf1c8d67')
self.assertEqual(u.bytes, u2.bytes)
self.assertEqual(u, u2)

def test_uuid1(self):
u = libuuid.uuid1()
u2 = uuid.UUID(bytes=u.bytes)
Expand Down