From: Gregory P. Smith <greg@krypto.org>
Date: Tue, 16 Aug 2016 06:23:40 +0000 (-0700)
Subject: Issue #26750: use inspect.isdatadescriptor instead of our own
X-Git-Tag: v3.6.0b1~708^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4583d7fea9e3fbbc0a8f5333003938e358b5a58;p=python

Issue #26750: use inspect.isdatadescriptor instead of our own
_is_data_descriptor().
---

diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 83e9c46676..669890a4de 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -72,12 +72,6 @@ DescriptorTypes = (
 )
 
 
-def _is_data_descriptor(obj):
-    # Data descriptors are Properties, slots, getsets and C data members.
-    return ((hasattr(obj, '__set__') or hasattr(obj, '__del__')) and
-            hasattr(obj, '__get__'))
-
-
 def _get_signature_object(func, as_instance, eat_self):
     """
     Given an arbitrary, possibly callable object, try to create a suitable
@@ -2138,7 +2132,7 @@ def create_autospec(spec, spec_set=False, instance=False, _parent=None,
     _kwargs.update(kwargs)
 
     Klass = MagicMock
-    if _is_data_descriptor(spec):
+    if inspect.isdatadescriptor(spec):
         # descriptors don't have a spec
         # because we don't know what type they return
         _kwargs = {}