traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-39481: remove generic classes from ipaddress/mmap (GH-20045) 

These were added by mistake (see https://bugs.python.org/issue39481#msg366288).
This commit is contained in:
Batuhan Taskaya 2020-05-12 05:32:40 +03:00 committed by GitHub
parent b1b4c790e7
commit f3a5b7ada0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Lib/ipaddress.py
View File

@ -12,7 +12,6 @@ __version__ = '1.0'
import functools import functools
import types
IPV4LENGTH = 32 IPV4LENGTH = 32
IPV6LENGTH = 128 IPV6LENGTH = 128
@ -1125,8 +1124,6 @@ class _BaseNetwork(_IPAddressBase):
return (self.network_address.is_loopback and return (self.network_address.is_loopback and
self.broadcast_address.is_loopback) self.broadcast_address.is_loopback)
__class_getitem__ = classmethod(types.GenericAlias)
class _BaseV4: class _BaseV4:
"""Base IPv4 object. """Base IPv4 object.
@ -1446,8 +1443,6 @@ class IPv4Interface(IPv4Address):
return '%s/%s' % (self._string_from_ip_int(self._ip), return '%s/%s' % (self._string_from_ip_int(self._ip),
self.hostmask) self.hostmask)
__class_getitem__ = classmethod(types.GenericAlias)
class IPv4Network(_BaseV4, _BaseNetwork): class IPv4Network(_BaseV4, _BaseNetwork):
@ -2156,8 +2151,6 @@ class IPv6Interface(IPv6Address):
def is_loopback(self): def is_loopback(self):
return self._ip == 1 and self.network.is_loopback return self._ip == 1 and self.network.is_loopback
__class_getitem__ = classmethod(types.GenericAlias)
class IPv6Network(_BaseV6, _BaseNetwork): class IPv6Network(_BaseV6, _BaseNetwork):

4
Lib/test/test_genericalias.py
View File

@ -17,8 +17,6 @@ from ctypes import Array, LibraryLoader
from difflib import SequenceMatcher from difflib import SequenceMatcher
from filecmp import dircmp from filecmp import dircmp
from fileinput import FileInput from fileinput import FileInput
from mmap import mmap
from ipaddress import IPv4Network, IPv4Interface, IPv6Network, IPv6Interface
from itertools import chain from itertools import chain
from http.cookies import Morsel from http.cookies import Morsel
from multiprocessing.managers import ValueProxy from multiprocessing.managers import ValueProxy
@ -49,7 +47,6 @@ class BaseTest(unittest.TestCase):
def test_subscriptable(self): def test_subscriptable(self):
for t in (type, tuple, list, dict, set, frozenset, enumerate, for t in (type, tuple, list, dict, set, frozenset, enumerate,
mmap,
defaultdict, deque, defaultdict, deque,
SequenceMatcher, SequenceMatcher,
dircmp, dircmp,
@ -74,7 +71,6 @@ class BaseTest(unittest.TestCase):
Sequence, MutableSequence, Sequence, MutableSequence,
MappingProxyType, AsyncGeneratorType, MappingProxyType, AsyncGeneratorType,
DirEntry, DirEntry,
IPv4Network, IPv4Interface, IPv6Network, IPv6Interface,
chain, chain,
TemporaryDirectory, SpooledTemporaryFile, TemporaryDirectory, SpooledTemporaryFile,
Queue, SimpleQueue, Queue, SimpleQueue,

2
Modules/mmapmodule.c
View File

@ -816,8 +816,6 @@ static struct PyMethodDef mmap_object_methods[] = {
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
{"__sizeof__", (PyCFunction) mmap__sizeof__method, METH_NOARGS}, {"__sizeof__", (PyCFunction) mmap__sizeof__method, METH_NOARGS},
#endif #endif
{"__class_getitem__", (PyCFunction)Py_GenericAlias, METH_O|METH_CLASS,
PyDoc_STR("See PEP 585")},
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };