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
Merge remote-tracking branch 'reference/master' into bug/3354 
Conflicts:
	rest_framework/compat.py
  • Loading branch information
@xordoquy
xordoquy committed Oct 20, 2015
commit 026e114665b85ce87f318eb3f8f29428e599e548
8 changes: 0 additions & 8 deletions rest_framework/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,6 @@ def distinct(queryset, base):
pass


def get_model_name(model_cls):
try:
return model_cls._meta.model_name
except AttributeError:
# < 1.6 used module_name instead of model_name
return model_cls._meta.module_name


class CustomValidatorMessage(object):
def __init__(self, *args, **kwargs):
self.message = kwargs.pop('message', self.message)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.