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

Use django exception instead custom one

Browse source
This commit is contained in:
JMP 2019-02-26 19:17:06 +01:00
parent 2a47aa093d
commit ce3a0e59f4
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
model_utils/exceptions.py
View file

@ -1,2 +0,0 @@
class UUIDVersionException(Exception):
pass

12
model_utils/fields.py
View file

@ -4,11 +4,10 @@ import django
import uuid
from django.db import models
from django.conf import settings
from django.core.exceptions import ValidationError
from django.utils.encoding import python_2_unicode_compatible
from django.utils.timezone import now
from model_utils.exceptions import UUIDVersionException
DEFAULT_CHOICES_NAME = 'STATUS'
@ -152,7 +151,8 @@ SPLIT_MARKER = getattr(settings, 'SPLIT_MARKER', '<!-- split -->')
SPLIT_DEFAULT_PARAGRAPHS = getattr(settings, 'SPLIT_DEFAULT_PARAGRAPHS', 2)
def _excerpt_field_name(name): return '_%s_excerpt' % name
def _excerpt_field_name(name):
return '_%s_excerpt' % name
def get_excerpt(content):
@ -281,7 +281,7 @@ class UUIDField(models.UUIDField):
Raises
------
UUIDVersionException
ValidationError
UUID version 2 is not supported.
"""
kwargs.setdefault('primary_key', primary_key)
@ -292,14 +292,14 @@ class UUIDField(models.UUIDField):
elif version == 1:
default = uuid.uuid1
elif version == 2:
raise UUIDVersionException(
raise ValidationError(
'UUID version 2 is not supported.')
elif version == 3:
default = uuid.uuid3
elif version == 5:
default = uuid.uuid5
else:
raise UUIDVersionException(
raise ValidationError(
'UUID version is not valid.')
kwargs.setdefault('default', default)