Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
aa349fe7
Commit
aa349fe7
authored
Aug 01, 2016
by
Tom Christie
Committed by
GitHub
Aug 01, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle non-string input for IP fields (#4338)
parent
e9977133
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletions
+5
-1
rest_framework/fields.py
+4
-1
tests/test_fields.py
+1
-0
No files found.
rest_framework/fields.py
View file @
aa349fe7
...
@@ -804,7 +804,10 @@ class IPAddressField(CharField):
...
@@ -804,7 +804,10 @@ class IPAddressField(CharField):
self
.
validators
.
extend
(
validators
)
self
.
validators
.
extend
(
validators
)
def
to_internal_value
(
self
,
data
):
def
to_internal_value
(
self
,
data
):
if
data
and
':'
in
data
:
if
not
isinstance
(
data
,
six
.
string_types
):
self
.
fail
(
'invalid'
,
value
=
data
)
if
':'
in
data
:
try
:
try
:
if
self
.
protocol
in
(
'both'
,
'ipv6'
):
if
self
.
protocol
in
(
'both'
,
'ipv6'
):
return
clean_ipv6_address
(
data
,
self
.
unpack_ipv4
)
return
clean_ipv6_address
(
data
,
self
.
unpack_ipv4
)
...
...
tests/test_fields.py
View file @
aa349fe7
...
@@ -663,6 +663,7 @@ class TestIPAddressField(FieldValues):
...
@@ -663,6 +663,7 @@ class TestIPAddressField(FieldValues):
'127.122.111.2231'
:
[
'Enter a valid IPv4 or IPv6 address.'
],
'127.122.111.2231'
:
[
'Enter a valid IPv4 or IPv6 address.'
],
'2001:::9652'
:
[
'Enter a valid IPv4 or IPv6 address.'
],
'2001:::9652'
:
[
'Enter a valid IPv4 or IPv6 address.'
],
'2001:0db8:85a3:0042:1000:8a2e:0370:73341'
:
[
'Enter a valid IPv4 or IPv6 address.'
],
'2001:0db8:85a3:0042:1000:8a2e:0370:73341'
:
[
'Enter a valid IPv4 or IPv6 address.'
],
1000
:
[
'Enter a valid IPv4 or IPv6 address.'
],
}
}
outputs
=
{}
outputs
=
{}
field
=
serializers
.
IPAddressField
()
field
=
serializers
.
IPAddressField
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment