Skip to content

IPAddressField improvements #3008

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
Jun 4, 2015
Merged

IPAddressField improvements #3008

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d5eee0
add IPAddressField, update docs
Ins1ne Feb 28, 2015
313b3d7
Update ModelSerializer mappings
Ins1ne Feb 28, 2015
de72022
Merge branch 'master' of https://github.com/Ins1ne/django-rest-framew…
Ins1ne Feb 28, 2015
c44376c
remove unnecessary check
Ins1ne Mar 4, 2015
1d883e0
Add two more tests for IPAddressField, checking the IPv4 and IPv6 pro…
andreagrandi Mar 22, 2015
a0049dd
Add a blank line to make lint happier
andreagrandi Mar 22, 2015
466575b
Lowercase the input
andreagrandi Mar 26, 2015
d6effbf
Remove unpack_ipv4 parameter
andreagrandi Apr 2, 2015
dee5fb5
Merge remote-tracking branch 'reference/master' into feature/ipaddres…
xordoquy Jun 4, 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 branch 'master' of https://github.com/Ins1ne/django-rest-framework 
 into feature/ipaddress
  • Loading branch information
@Ins1ne
Ins1ne committed Feb 28, 2015
commit de72022f8036a010c1ca5d63a854c4ca4566233b
11 changes: 7 additions & 4 deletions rest_framework/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,9 +731,12 @@ class ModelSerializer(Serializer):
models.TimeField: TimeField,
models.URLField: URLField,
models.GenericIPAddressField: IPAddressField,
# Note: Some version-specific mappings also defined below.
})
_related_class = PrimaryKeyRelatedField
}
serializer_related_field = PrimaryKeyRelatedField
serializer_url_field = HyperlinkedIdentityField
serializer_choice_field = ChoiceField

# Default `create` and `update` behavior...

def create(self, validated_data):
"""
Expand Down Expand Up @@ -1347,7 +1350,7 @@ def get_unique_for_date_validators(self):

# IPAddressField is deprecated in Django
if hasattr(models, 'IPAddressField'):
ModelSerializer._field_mapping[models.IPAddressField] = IPAddressField
ModelSerializer.serializer_field_mapping[models.IPAddressField] = IPAddressField

if postgres_fields:
class CharMappingField(DictField):
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.