From 0be853e7fbf6d665c5aa502bfd77aae28f8f170f Mon Sep 17 00:00:00 2001 From: DimitrisJim Date: Fri, 31 Mar 2017 01:48:40 +0300 Subject: [PATCH] bpo:29950: Rename SlotWrapperType to WrapperDescriptorType --- Doc/library/types.rst | 2 +- Lib/test/test_types.py | 8 ++++---- Lib/types.py | 2 +- Misc/NEWS | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Doc/library/types.rst b/Doc/library/types.rst index 2602e3cf761f5c..89aca9c9df864a 100644 --- a/Doc/library/types.rst +++ b/Doc/library/types.rst @@ -132,7 +132,7 @@ Standard names are defined for the following types: C".) -.. data:: SlotWrapperType +.. data:: WrapperDescriptorType The type of methods of some built-in data types and base classes such as :meth:`object.__init__` or :meth:`object.__lt__`. diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py index 4a9fcba526af4d..4fef9807ac1930 100644 --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -577,10 +577,10 @@ def test_internal_sizes(self): self.assertGreater(tuple.__itemsize__, 0) def test_slot_wrapper_types(self): - self.assertIsInstance(object.__init__, types.SlotWrapperType) - self.assertIsInstance(object.__str__, types.SlotWrapperType) - self.assertIsInstance(object.__lt__, types.SlotWrapperType) - self.assertIsInstance(int.__lt__, types.SlotWrapperType) + self.assertIsInstance(object.__init__, types.WrapperDescriptorType) + self.assertIsInstance(object.__str__, types.WrapperDescriptorType) + self.assertIsInstance(object.__lt__, types.WrapperDescriptorType) + self.assertIsInstance(int.__lt__, types.WrapperDescriptorType) def test_method_wrapper_types(self): self.assertIsInstance(object().__init__, types.MethodWrapperType) diff --git a/Lib/types.py b/Lib/types.py index 1b7859e73a19b9..929cba223aa905 100644 --- a/Lib/types.py +++ b/Lib/types.py @@ -36,7 +36,7 @@ def _m(self): pass BuiltinFunctionType = type(len) BuiltinMethodType = type([].append) # Same as BuiltinFunctionType -SlotWrapperType = type(object.__init__) +WrapperDescriptorType = type(object.__init__) MethodWrapperType = type(object().__str__) MethodDescriptorType = type(str.join) diff --git a/Misc/NEWS b/Misc/NEWS index c8471b7ebfe4e1..96b8768370a2e4 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -406,7 +406,7 @@ Library - Issue #29444: Fixed out-of-bounds buffer access in the group() method of the match object. Based on patch by WGH. -- Issue #29377: Add SlotWrapperType, MethodWrapperType, and +- Issue #29377: Add WrapperDescriptorType, MethodWrapperType, and MethodDescriptorType built-in types to types module. Original patch by Manuel Krebber.