Hopiu/django-model-utils
1
0
Fork 0
mirror of https://github.com/Hopiu/django-model-utils.git synced 2026-03-26 00:00:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:marfyl/django-model-utils

Browse source
This commit is contained in:
JMP 2019-03-20 21:51:41 +01:00
commit fa9a0376dd
2 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/models.rst
View file

@ -71,7 +71,6 @@ Also you can override the default uuid version. Versions 1,3,4 and 5 are now sup
.. code-block:: python
from model_utils.models import UUIDModel
from model_utils import Choices
class MyAppModel(UUIDModel):
pass

30
model_utils/fields.py
View file

@ -284,23 +284,25 @@ class UUIDField(models.UUIDField):
ValidationError
UUID version 2 is not supported.
"""
kwargs.setdefault('primary_key', primary_key)
kwargs.setdefault('editable', editable)
if version == 4:
default = uuid.uuid4
elif version == 1:
default = uuid.uuid1
elif version == 2:
if version == 2:
raise ValidationError(
'UUID version 2 is not supported.')
elif version == 3:
default = uuid.uuid3
elif version == 5:
default = uuid.uuid5
else:
if version < 1 or version > 5:
raise ValidationError(
'UUID version is not valid.')
if version == 1:
default = uuid.uuid1
elif version == 3:
default = uuid.uuid3
elif version == 4:
default = uuid.uuid4
elif version == 5:
default = uuid.uuid5
kwargs.setdefault('primary_key', primary_key)
kwargs.setdefault('editable', editable)
kwargs.setdefault('default', default)
super(UUIDField, self).__init__(*args, **kwargs)