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

Show file tree
Hide file tree
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
Remove Django 1.5 clean_manytomany_helptext fallback
  • Loading branch information
Carlton Gibson committed Sep 21, 2015
commit 8ea1606abf5eee6a3e97c71b3cc93a81e362d782
11 changes: 0 additions & 11 deletions rest_framework/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,6 @@ def distinct(queryset, base):
except ImportError:
django_filters = None

if django.VERSION >= (1, 6):
def clean_manytomany_helptext(text):
return text
else:
# Up to version 1.5 many to many fields automatically suffix
# the `help_text` attribute with hardcoded text.
def clean_manytomany_helptext(text):
if text.endswith(' Hold down "Control", or "Command" on a Mac, to select more than one.'):
text = text[:-69]
return text

# Django-guardian is optional. Import only if guardian is in INSTALLED_APPS
# Fixes (#1712). We keep the try/except for the test suite.
guardian = None
Expand Down
3 changes: 1 addition & 2 deletions rest_framework/utils/field_mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from django.db import models
from django.utils.text import capfirst

from rest_framework.compat import clean_manytomany_helptext
from rest_framework.validators import UniqueValidator

NUMERIC_FIELD_TYPES = (
Expand Down Expand Up @@ -222,7 +221,7 @@ def get_relation_kwargs(field_name, relation_info):
if model_field:
if model_field.verbose_name and needs_label(model_field, field_name):
kwargs['label'] = capfirst(model_field.verbose_name)
help_text = clean_manytomany_helptext(model_field.help_text)
help_text = model_field.help_text
if help_text:
kwargs['help_text'] = help_text
if not model_field.editable:
Expand Down