Skip to content

Adjust Supported Python/Django Versions #3421

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

Merged
lovelydinosaur merged 9 commits into from
Sep 22, 2015
Merged

Adjust Supported Python/Django Versions #3421

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
796baab
Drop Pythons 3.2, 3.3 for Django `master`
Sep 21, 2015
366dff4
Test Python 3.5 against Django `master`
Sep 21, 2015
8edb9d3
Drop testing against Django 1.5
Sep 21, 2015
9216dc9
Remove Django 1.5 EmailValidator fallback
Sep 21, 2015
e625cff
Remove Django 1.5 URLValidator fallback
Sep 21, 2015
4a1ab3c
Fix isort errors
Sep 21, 2015
25de8c9
Remove Django 1.5 get_model_name fallback
Sep 21, 2015
8ea1606
Remove Django 1.5 clean_manytomany_helptext fallback
Sep 21, 2015
2aa33ed
Adjust README and Release Notes
Sep 21, 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 isort errors
  • Loading branch information
Carlton Gibson committed Sep 21, 2015
commit 4a1ab3c18c7c85c9d962e7b6605e7d57423d29fe
8 changes: 5 additions & 3 deletions rest_framework/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
from django.conf import settings
from django.core.exceptions import ValidationError as DjangoValidationError
from django.core.exceptions import ObjectDoesNotExist
from django.core.validators import EmailValidator, RegexValidator, ip_address_validators, URLValidator
from django.core.validators import (
EmailValidator, RegexValidator, URLValidator, ip_address_validators
)
from django.forms import FilePathField as DjangoFilePathField
from django.forms import ImageField as DjangoImageField
from django.utils import six, timezone
Expand All @@ -24,8 +26,8 @@
from rest_framework import ISO_8601
from rest_framework.compat import (
MaxLengthValidator, MaxValueValidator, MinLengthValidator,
MinValueValidator, OrderedDict, duration_string,
parse_duration, unicode_repr, unicode_to_repr
MinValueValidator, OrderedDict, duration_string, parse_duration,
unicode_repr, unicode_to_repr
)
from rest_framework.exceptions import ValidationError
from rest_framework.settings import api_settings
Expand Down