Skip to content

Commit 69edd9b

Browse files
committed
remove six dependency
1 parent b4f0450 commit 69edd9b

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

ci/environment-py38.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ dependencies:
1111
- tornado
1212
- toolz
1313
- zict
14-
- six
1514
- librdkafka=1.5.3
1615
- dask
1716
- distributed

ci/environment-py39.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ dependencies:
1111
- tornado
1212
- toolz
1313
- zict
14-
- six
1514
- librdkafka=1.5.3
1615
- dask
1716
- distributed

requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
tornado
22
toolz
33
zict
4-
six
5-
setuptools
4+
setuptools

streamz/core.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from itertools import chain
55
import functools
66
import logging
7-
import six
87
import sys
98
import threading
109
from time import time
@@ -1947,8 +1946,8 @@ def f():
19471946
if timeout is not None:
19481947
future = gen.with_timeout(timedelta(seconds=timeout), future)
19491948
result[0] = yield future
1950-
except Exception:
1951-
error[0] = sys.exc_info()
1949+
except Exception as exc:
1950+
pass
19521951
finally:
19531952
thread_state.asynchronous = False
19541953
e.set()
@@ -1960,7 +1959,8 @@ def f():
19601959
else:
19611960
while not e.is_set():
19621961
e.wait(10)
1962+
19631963
if error[0]:
1964-
six.reraise(*error[0])
1964+
raise exc
19651965
else:
19661966
return result[0]

streamz/utils_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import asyncio
22
from contextlib import contextmanager
3+
import io
34
import logging
45
import os
5-
import six
66
import shutil
77
import tempfile
88
from time import time, sleep
@@ -85,7 +85,7 @@ def captured_logger(logger, level=logging.INFO, propagate=None):
8585
if propagate is not None:
8686
orig_propagate = logger.propagate
8787
logger.propagate = propagate
88-
sio = six.StringIO()
88+
sio = io.StringIO()
8989
logger.handlers[:] = [logging.StreamHandler(sio)]
9090
logger.setLevel(level)
9191
try:

0 commit comments

Comments
 (0)