Skip to content

bpo-29950: Rename SlotWrapperType to WrapperDescriptorType #926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2017
Merged

bpo-29950: Rename SlotWrapperType to WrapperDescriptorType #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Doc/library/types.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__`.
Expand Down
8 changes: 4 additions & 4 deletions Lib/test/test_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Lib/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion Misc/NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down