1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
From 33f49417b415deb7ea3c495a404b78c9d3743c03 Mon Sep 17 00:00:00 2001
From: Alexandre Detiste <alexandre.detiste@gmail.com>
Date: Sat, 15 Jun 2024 18:30:28 +0200
Subject: [PATCH 1/5] remove six dependency
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
tornado
toolz
zict
-six
-setuptools
\ No newline at end of file
+setuptools
--- a/streamz/core.py
+++ b/streamz/core.py
@@ -3,8 +3,6 @@
from datetime import timedelta
import functools
import logging
-import six
-import sys
import threading
from time import time
from typing import Any, Callable, Hashable, Union
@@ -1926,8 +1924,8 @@
if timeout is not None:
future = gen.with_timeout(timedelta(seconds=timeout), future)
result[0] = yield future
- except Exception:
- error[0] = sys.exc_info()
+ except Exception as exc:
+ error[0] = exc
finally:
thread_state.asynchronous = False
e.set()
@@ -1939,7 +1937,8 @@
else:
while not e.is_set():
e.wait(10)
+
if error[0]:
- six.reraise(*error[0])
+ raise error[0]
else:
return result[0]
--- a/streamz/utils_test.py
+++ b/streamz/utils_test.py
@@ -1,8 +1,8 @@
import asyncio
from contextlib import contextmanager
+import io
import logging
import os
-import six
import shutil
import tempfile
from time import time, sleep
@@ -85,7 +85,7 @@
if propagate is not None:
orig_propagate = logger.propagate
logger.propagate = propagate
- sio = six.StringIO()
+ sio = io.StringIO()
logger.handlers[:] = [logging.StreamHandler(sio)]
logger.setLevel(level)
try:
|
