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
88f64f39
Commit
88f64f39
authored
Mar 07, 2015
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #23103: Reduced the memory consumption of IPv4Address and IPv6Address.
parent
a5f3ad8c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
13 deletions
+21
-13
Lib/ipaddress.py
Lib/ipaddress.py
+12
-13
Lib/test/test_ipaddress.py
Lib/test/test_ipaddress.py
+7
-0
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Lib/ipaddress.py
View file @
88f64f39
...
...
@@ -386,6 +386,8 @@ class _IPAddressBase:
"""The mother class."""
__slots__
=
()
@
property
def
exploded
(
self
):
"""Return the longhand version of the IP address as a string."""
...
...
@@ -543,6 +545,8 @@ class _BaseAddress(_IPAddressBase):
used by single IP addresses.
"""
__slots__
=
()
def
__int__
(
self
):
return
self
.
_ip
...
...
@@ -1051,6 +1055,8 @@ class _BaseV4:
"""
__slots__
=
()
_version
=
4
# Equivalent to 255.255.255.255 or 32 bits of 1's.
_ALL_ONES
=
(
2
**
IPV4LENGTH
)
-
1
_DECIMAL_DIGITS
=
frozenset
(
'0123456789'
)
...
...
@@ -1063,9 +1069,6 @@ class _BaseV4:
# when constructed (see _make_netmask()).
_netmask_cache
=
{}
def
__init__
(
self
,
address
):
self
.
_version
=
4
def
_explode_shorthand_ip_string
(
self
):
return
str
(
self
)
...
...
@@ -1243,6 +1246,8 @@ class IPv4Address(_BaseV4, _BaseAddress):
"""Represent and manipulate single IPv4 Addresses."""
__slots__
=
(
'_ip'
,
'__weakref__'
)
def
__init__
(
self
,
address
):
"""
...
...
@@ -1259,8 +1264,6 @@ class IPv4Address(_BaseV4, _BaseAddress):
AddressValueError: If ipaddress isn't a valid IPv4 address.
"""
_BaseV4
.
__init__
(
self
,
address
)
# Efficient constructor from integer.
if
isinstance
(
address
,
int
):
self
.
_check_int_address
(
address
)
...
...
@@ -1485,8 +1488,6 @@ class IPv4Network(_BaseV4, _BaseNetwork):
supplied.
"""
_BaseV4
.
__init__
(
self
,
address
)
_BaseNetwork
.
__init__
(
self
,
address
)
# Constructing from a packed address or integer
...
...
@@ -1590,6 +1591,8 @@ class _BaseV6:
"""
__slots__
=
()
_version
=
6
_ALL_ONES
=
(
2
**
IPV6LENGTH
)
-
1
_HEXTET_COUNT
=
8
_HEX_DIGITS
=
frozenset
(
'0123456789ABCDEFabcdef'
)
...
...
@@ -1599,9 +1602,6 @@ class _BaseV6:
# when constructed (see _make_netmask()).
_netmask_cache
=
{}
def
__init__
(
self
,
address
):
self
.
_version
=
6
@
classmethod
def
_make_netmask
(
cls
,
arg
):
"""Make a (netmask, prefix_len) tuple from the given argument.
...
...
@@ -1870,6 +1870,8 @@ class IPv6Address(_BaseV6, _BaseAddress):
"""Represent and manipulate single IPv6 Addresses."""
__slots__
=
(
'_ip'
,
'__weakref__'
)
def
__init__
(
self
,
address
):
"""Instantiate a new IPv6 address object.
...
...
@@ -1887,8 +1889,6 @@ class IPv6Address(_BaseV6, _BaseAddress):
AddressValueError: If address isn't a valid IPv6 address.
"""
_BaseV6
.
__init__
(
self
,
address
)
# Efficient constructor from integer.
if
isinstance
(
address
,
int
):
self
.
_check_int_address
(
address
)
...
...
@@ -2180,7 +2180,6 @@ class IPv6Network(_BaseV6, _BaseNetwork):
supplied.
"""
_BaseV6
.
__init__
(
self
,
address
)
_BaseNetwork
.
__init__
(
self
,
address
)
# Efficient constructor from integer or packed address
...
...
Lib/test/test_ipaddress.py
View file @
88f64f39
...
...
@@ -11,6 +11,7 @@ import functools
import
operator
import
pickle
import
ipaddress
import
weakref
class
BaseTestCase
(
unittest
.
TestCase
):
...
...
@@ -259,6 +260,9 @@ class AddressTestCase_v4(BaseTestCase, CommonTestMixin_v4):
def
test_pickle
(
self
):
self
.
pickle_test
(
'192.0.2.1'
)
def
test_weakref
(
self
):
weakref
.
ref
(
self
.
factory
(
'192.0.2.1'
))
class
AddressTestCase_v6
(
BaseTestCase
,
CommonTestMixin_v6
):
factory
=
ipaddress
.
IPv6Address
...
...
@@ -394,6 +398,9 @@ class AddressTestCase_v6(BaseTestCase, CommonTestMixin_v6):
def
test_pickle
(
self
):
self
.
pickle_test
(
'2001:db8::'
)
def
test_weakref
(
self
):
weakref
.
ref
(
self
.
factory
(
'2001:db8::'
))
class
NetmaskTestMixin_v4
(
CommonTestMixin_v4
):
"""Input validation on interfaces and networks is very similar"""
...
...
Misc/NEWS
View file @
88f64f39
...
...
@@ -17,6 +17,8 @@ Core and Builtins
Library
-------
- Issue #23103: Reduced the memory consumption of IPv4Address and IPv6Address.
- Issue #21793: BaseHTTPRequestHandler again logs response code as numeric,
not as stringified enum. Patch by Demian Brecht.
...
...
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