mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Issue #4806: Avoid masking original TypeError in call with * unpacking
Based on patch by Hagen Fürstenau and Daniel Urban.
This commit is contained in:
parent
4c5ad9452b
commit
b5944220ab
3 changed files with 58 additions and 13 deletions
|
@ -114,7 +114,7 @@ Verify clearing of SF bug #733667
|
|||
>>> g(*Nothing())
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
TypeError: g() argument after * must be a sequence, not Nothing
|
||||
TypeError: g() argument after * must be an iterable, not Nothing
|
||||
|
||||
>>> class Nothing:
|
||||
... def __len__(self): return 5
|
||||
|
@ -123,7 +123,7 @@ Verify clearing of SF bug #733667
|
|||
>>> g(*Nothing())
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
TypeError: g() argument after * must be a sequence, not Nothing
|
||||
TypeError: g() argument after * must be an iterable, not Nothing
|
||||
|
||||
>>> class Nothing():
|
||||
... def __len__(self): return 5
|
||||
|
@ -149,6 +149,45 @@ Verify clearing of SF bug #733667
|
|||
>>> g(*Nothing())
|
||||
0 (1, 2, 3) {}
|
||||
|
||||
Check for issue #4806: Does a TypeError in a generator get propagated with the
|
||||
right error message? (Also check with other iterables.)
|
||||
|
||||
>>> def broken(): raise TypeError("myerror")
|
||||
...
|
||||
|
||||
>>> g(*(broken() for i in range(1)))
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
TypeError: myerror
|
||||
|
||||
>>> class BrokenIterable1:
|
||||
... def __iter__(self):
|
||||
... raise TypeError('myerror')
|
||||
...
|
||||
>>> g(*BrokenIterable1())
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
TypeError: myerror
|
||||
|
||||
>>> class BrokenIterable2:
|
||||
... def __iter__(self):
|
||||
... yield 0
|
||||
... raise TypeError('myerror')
|
||||
...
|
||||
>>> g(*BrokenIterable2())
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
TypeError: myerror
|
||||
|
||||
>>> class BrokenSequence:
|
||||
... def __getitem__(self, idx):
|
||||
... raise TypeError('myerror')
|
||||
...
|
||||
>>> g(*BrokenSequence())
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
TypeError: myerror
|
||||
|
||||
Make sure that the function doesn't stomp the dictionary
|
||||
|
||||
>>> d = {'a': 1, 'b': 2, 'c': 3}
|
||||
|
@ -188,17 +227,17 @@ What about willful misconduct?
|
|||
>>> h(*h)
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
TypeError: h() argument after * must be a sequence, not function
|
||||
TypeError: h() argument after * must be an iterable, not function
|
||||
|
||||
>>> dir(*h)
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
TypeError: dir() argument after * must be a sequence, not function
|
||||
TypeError: dir() argument after * must be an iterable, not function
|
||||
|
||||
>>> None(*h)
|
||||
Traceback (most recent call last):
|
||||
...
|
||||
TypeError: NoneType object argument after * must be a sequence, \
|
||||
TypeError: NoneType object argument after * must be an iterable, \
|
||||
not function
|
||||
|
||||
>>> h(**h)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue