Skip to content

Commit 19425a7

Browse files
committed
Add type version check
1 parent f6b6981 commit 19425a7

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

singlestoredb/connection.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import io
66
import queue
77
import re
8+
import sys
89
import warnings
910
import weakref
1011
from collections.abc import Mapping
@@ -35,6 +36,11 @@ def itertuples(self, *args: Any, **kwargs: Any) -> None:
3536
from .utils.results import Description
3637
from .utils.results import Result
3738

39+
if sys.version_info < (3, 10):
40+
InfileQueue = queue.Queue
41+
else:
42+
InfileQueue = queue.Queue[Union[bytes, str]]
43+
3844

3945
# DB-API settings
4046
apilevel = '2.0'
@@ -498,12 +504,12 @@ def close(self) -> None:
498504
def execute(
499505
self, query: str,
500506
args: Optional[Union[Sequence[Any], Dict[str, Any], Any]] = None,
501-
infile_stream: Optional[
507+
infile_stream: Optional[ # type: ignore
502508
Union[
503509
io.RawIOBase,
504510
io.TextIOBase,
505511
Iterator[Union[bytes, str]],
506-
queue.Queue[Union[bytes, str]],
512+
InfileQueue,
507513
]
508514
] = None,
509515
) -> int:

singlestoredb/http/connection.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import json
88
import math
99
import os
10-
import queue
1110
import re
1211
import time
1312
from base64 import b64decode
@@ -422,12 +421,12 @@ def close(self) -> None:
422421
def execute(
423422
self, query: str,
424423
args: Optional[Union[Sequence[Any], Dict[str, Any]]] = None,
425-
infile_stream: Optional[
424+
infile_stream: Optional[ # type: ignore
426425
Union[
427426
io.RawIOBase,
428427
io.TextIOBase,
429428
Iterable[Union[bytes, str]],
430-
queue.Queue[Union[bytes, str]],
429+
connection.InfileQueue,
431430
]
432431
] = None,
433432
) -> int:
@@ -506,12 +505,12 @@ def _execute(
506505
self, oper: str,
507506
params: Optional[Union[Sequence[Any], Dict[str, Any]]] = None,
508507
is_callproc: bool = False,
509-
infile_stream: Optional[
508+
infile_stream: Optional[ # type: ignore
510509
Union[
511510
io.RawIOBase,
512511
io.TextIOBase,
513512
Iterable[Union[bytes, str]],
514-
queue.Queue[Union[bytes, str]],
513+
connection.InfileQueue,
515514
]
516515
] = None,
517516
) -> int:

0 commit comments

Comments
 (0)