Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
58a10967
Commit
58a10967
authored
Feb 23, 2018
by
INADA Naoki
Committed by
GitHub
Feb 23, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ipaddress: Use str.isascii() instead of frozenset (GH-5811)
parent
33dddac0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
Lib/ipaddress.py
Lib/ipaddress.py
+2
-3
No files found.
Lib/ipaddress.py
View file @
58a10967
...
...
@@ -488,7 +488,7 @@ class _IPAddressBase:
"""
# int allows a leading +/- as well as surrounding whitespace,
# so we ensure that isn't the case
if
not
_BaseV4
.
_DECIMAL_DIGITS
.
issuperset
(
prefixlen_str
):
if
not
(
prefixlen_str
.
isascii
()
and
prefixlen_str
.
isdigit
()
):
cls
.
_report_invalid_netmask
(
prefixlen_str
)
try
:
prefixlen
=
int
(
prefixlen_str
)
...
...
@@ -1076,7 +1076,6 @@ class _BaseV4:
_version
=
4
# Equivalent to 255.255.255.255 or 32 bits of 1's.
_ALL_ONES
=
(
2
**
IPV4LENGTH
)
-
1
_DECIMAL_DIGITS
=
frozenset
(
'0123456789'
)
# the valid octets for host and netmasks. only useful for IPv4.
_valid_mask_octets
=
frozenset
({
255
,
254
,
252
,
248
,
240
,
224
,
192
,
128
,
0
})
...
...
@@ -1156,7 +1155,7 @@ class _BaseV4:
if
not
octet_str
:
raise
ValueError
(
"Empty octet not permitted"
)
# Whitelist the characters, since int() allows a lot of bizarre stuff.
if
not
cls
.
_DECIMAL_DIGITS
.
issuperset
(
octet_str
):
if
not
(
octet_str
.
isascii
()
and
octet_str
.
isdigit
()
):
msg
=
"Only decimal digits permitted in %r"
raise
ValueError
(
msg
%
octet_str
)
# We do the length check second, since the invalid character error
...
...
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