Commit 5c85653f authored by Stefan Behnel's avatar Stefan Behnel

work around error message change in Py3.5

parent a3a44506
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
import cython import cython
_set = set
def _it(N): def _it(N):
for i in range(N): for i in range(N):
yield i yield i
cdef class ItCount(object): cdef class ItCount(object):
cdef object values cdef object values
cdef readonly count cdef readonly count
...@@ -89,9 +89,9 @@ def unpack_partial(it): ...@@ -89,9 +89,9 @@ def unpack_partial(it):
""" """
>>> it = _it(2) >>> it = _it(2)
>>> a = b = c = 0 >>> a = b = c = 0
>>> a,b,c = it >>> try: a,b,c = it
Traceback (most recent call last): ... except ValueError: pass
ValueError: need more than 2 values to unpack ... else: print("DID NOT FAIL!")
>>> a, b, c >>> a, b, c
(0, 0, 0) (0, 0, 0)
>>> unpack_partial([1,2]) >>> unpack_partial([1,2])
...@@ -103,9 +103,9 @@ def unpack_partial(it): ...@@ -103,9 +103,9 @@ def unpack_partial(it):
>>> it = ItCount([1,2]) >>> it = ItCount([1,2])
>>> a = b = c = 0 >>> a = b = c = 0
>>> a,b,c = it >>> try: a,b,c = it
Traceback (most recent call last): ... except ValueError: pass
ValueError: need more than 2 values to unpack ... else: print("DID NOT FAIL!")
>>> a, b, c >>> a, b, c
(0, 0, 0) (0, 0, 0)
>>> it.count >>> it.count
...@@ -153,7 +153,7 @@ def unpack_partial_typed(it): ...@@ -153,7 +153,7 @@ def unpack_partial_typed(it):
(0, 0, 0) (0, 0, 0)
>>> unpack_partial_typed((1, 'abc', 3)) >>> unpack_partial_typed((1, 'abc', 3))
(0, 0, 0) (0, 0, 0)
>>> unpack_partial_typed(_set([1, 'abc', 3])) >>> unpack_partial_typed(set([1, 'abc', 3]))
(0, 0, 0) (0, 0, 0)
>>> it = ItCount([1, 'abc', 3]) >>> it = ItCount([1, 'abc', 3])
...@@ -222,10 +222,10 @@ def failure_too_many(it): ...@@ -222,10 +222,10 @@ def failure_too_many(it):
Traceback (most recent call last): Traceback (most recent call last):
ValueError: too many values to unpack (expected 3) ValueError: too many values to unpack (expected 3)
>>> a,b,c = _set([1,2,3,4]) # doctest: +ELLIPSIS >>> a,b,c = set([1,2,3,4]) # doctest: +ELLIPSIS
Traceback (most recent call last): Traceback (most recent call last):
ValueError: too many values to unpack... ValueError: too many values to unpack...
>>> failure_too_many(_set([1,2,3,4])) >>> failure_too_many(set([1,2,3,4]))
Traceback (most recent call last): Traceback (most recent call last):
ValueError: too many values to unpack (expected 3) ValueError: too many values to unpack (expected 3)
...@@ -239,6 +239,7 @@ def failure_too_many(it): ...@@ -239,6 +239,7 @@ def failure_too_many(it):
a,b,c = it a,b,c = it
return a,b,c return a,b,c
def failure_too_few(it): def failure_too_few(it):
""" """
>>> try: a,b,c = [1,2] >>> try: a,b,c = [1,2]
...@@ -253,16 +254,16 @@ def failure_too_few(it): ...@@ -253,16 +254,16 @@ def failure_too_few(it):
Traceback (most recent call last): Traceback (most recent call last):
ValueError: need more than 2 values to unpack ValueError: need more than 2 values to unpack
>>> a,b,c = _set([1,2]) >>> try: a,b,c = set([1,2])
Traceback (most recent call last): ... except ValueError: pass
ValueError: need more than 2 values to unpack ... else: print("DID NOT FAIL!")
>>> failure_too_few(_set([1,2])) >>> failure_too_few(set([1,2]))
Traceback (most recent call last): Traceback (most recent call last):
ValueError: need more than 2 values to unpack ValueError: need more than 2 values to unpack
>>> a,b,c = _it(2) >>> try: a,b,c = _it(2)
Traceback (most recent call last): ... except ValueError: pass
ValueError: need more than 2 values to unpack ... else: print("DID NOT FAIL!")
>>> failure_too_few(_it(2)) >>> failure_too_few(_it(2))
Traceback (most recent call last): Traceback (most recent call last):
ValueError: need more than 2 values to unpack ValueError: need more than 2 values to unpack
...@@ -270,6 +271,7 @@ def failure_too_few(it): ...@@ -270,6 +271,7 @@ def failure_too_few(it):
a,b,c = it a,b,c = it
return a,b,c return a,b,c
def _it_failure(N): def _it_failure(N):
for i in range(N): for i in range(N):
yield i yield i
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment