mirror of
https://github.com/python/cpython.git
synced 2025-12-04 00:30:19 +00:00
Fix for SF bug #472940: can't getattr() attribute shown by dir()
There really isn't a good reason for instance method objects to have their own __dict__, __doc__ and __name__ properties that just delegate the request to the function (callable); the default attribute behavior already does this. The test suite had to be fixed because the error changes from TypeError to AttributeError.
This commit is contained in:
parent
51c18166bb
commit
56ff387a7e
2 changed files with 6 additions and 33 deletions
|
|
@ -108,8 +108,8 @@ if f1.a.myclass is not f2.a.myclass or \
|
|||
# try setting __dict__
|
||||
try:
|
||||
F.a.__dict__ = (1, 2, 3)
|
||||
except TypeError: pass
|
||||
else: raise TestFailed, 'expected TypeError'
|
||||
except (AttributeError, TypeError): pass
|
||||
else: raise TestFailed, 'expected TypeError or AttributeError'
|
||||
|
||||
F.a.im_func.__dict__ = {'one': 11, 'two': 22, 'three': 33}
|
||||
|
||||
|
|
@ -121,7 +121,7 @@ d = UserDict({'four': 44, 'five': 55})
|
|||
|
||||
try:
|
||||
F.a.__dict__ = d
|
||||
except TypeError: pass
|
||||
except (AttributeError, TypeError): pass
|
||||
else: raise TestFailed
|
||||
|
||||
if f2.a.one <> f1.a.one <> F.a.one <> 11:
|
||||
|
|
@ -218,13 +218,13 @@ def cantset(obj, name, value):
|
|||
verify(hasattr(obj, name)) # Otherwise it's probably a typo
|
||||
try:
|
||||
setattr(obj, name, value)
|
||||
except TypeError:
|
||||
except (AttributeError, TypeError):
|
||||
pass
|
||||
else:
|
||||
raise TestFailed, "shouldn't be able to set %s to %r" % (name, value)
|
||||
try:
|
||||
delattr(obj, name)
|
||||
except TypeError:
|
||||
except (AttributeError, TypeError):
|
||||
pass
|
||||
else:
|
||||
raise TestFailed, "shouldn't be able to del %s" % name
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue