Skip to content

Enable Validators to defer string evaluation and handle new string format #3438

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

Closed
xordoquy wants to merge 8 commits into from
Closed

Enable Validators to defer string evaluation and handle new string format #3438

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1f20cb7
Remove formatted messages as parameters to field bound validators, fi…
nryoung Sep 16, 2015
87aff64
Revert error messages.
xordoquy Sep 23, 2015
6007bc7
Min/MaxValue/LengthValidator now defer the message formatting and abl…
xordoquy Sep 23, 2015
1ce88be
Fix import order.
xordoquy Sep 23, 2015
3a4be04
Refactor the message generation to delay the formatting.
xordoquy Oct 19, 2015
026e114
Merge remote-tracking branch 'reference/master' into bug/3354
xordoquy Oct 20, 2015
e392ee7
Merge remote-tracking branch 'reference/master' into bug/3354
xordoquy Nov 25, 2015
fd34388
Use six.text_type instead of str.
xordoquy Nov 25, 2015
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
Prev Previous commit
Next Next commit
Fix import order.
  • Loading branch information
@xordoquy
xordoquy committed Sep 23, 2015
commit 1ce88beff04138b1e8635e0914ca4cb9922184b4
11 changes: 5 additions & 6 deletions rest_framework/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@

import django
from django.conf import settings
from django.core.exceptions import ValidationError
from django.core.validators import (
MaxLengthValidator, MaxValueValidator, MinLengthValidator,
MinValueValidator
)
from django.db import connection, transaction
from django.utils import six
from django.views.generic import View
from django.core.exceptions import ValidationError


try:
import importlib # Available in Python 3.1+
Expand Down Expand Up @@ -111,10 +114,6 @@ def get_model_name(model_cls):
return model_cls._meta.module_name


from django.core.validators import MinValueValidator
from django.core.validators import MaxValueValidator
from django.core.validators import MinLengthValidator
from django.core.validators import MaxLengthValidator


class CustomValidatorMessage(object):
Expand Down