Remove python3.7 code

curl_cffi/__version__.py

@@ -1,11 +1,8 @@
-# New in version 3.8.
-# from importlib import metadata
+from importlib import metadata
 from .curl import Curl
 
 
 __title__ = "curl_cffi"
-# __description__ = metadata.metadata("curl_cffi")["Summary"]
-# __version__ = metadata.version("curl_cffi")
-__description__ = "libcurl ffi bindings for Python, with impersonation support"
-__version__ = "0.6.0b9"
+__description__ = metadata.metadata("curl_cffi")["Summary"]
+__version__ = metadata.version("curl_cffi")
 __curl_version__ = Curl().version().decode()

curl_cffi/_asyncio_selector.py

@@ -26,10 +26,7 @@
 
 from typing import Set  # noqa: F401
 
-try:
-    from typing import Protocol
-except ImportError:
-    from typing_extensions import Protocol
+from typing import Protocol
 
 
 class _HasFileno(Protocol):

curl_cffi/requests/__init__.py

@@ -23,7 +23,7 @@
 
 from functools import partial
 from io import BytesIO
-from typing import Callable, Dict, Optional, Tuple, Union
+from typing import Callable, Dict, Optional, Tuple, Union, Literal
 
 
 from ..curl import CurlMime
@@ -32,11 +32,9 @@
 from .models import Request, Response
 from .errors import RequestsError
 from .headers import Headers, HeaderTypes
-from .session import AsyncSession, BrowserType, Session, ProxySpec
+from .session import AsyncSession, BrowserType, Session, ProxySpec, ThreadType
 from .websockets import WebSocket, WebSocketError, WsCloseCode
 
-# ThreadType = Literal["eventlet", "gevent", None]
-
 
 def request(
     method: str,
@@ -59,7 +57,7 @@ def request(
     accept_encoding: Optional[str] = "gzip, deflate, br",
     content_callback: Optional[Callable] = None,
     impersonate: Optional[Union[str, BrowserType]] = None,
-    thread: Optional[str] = None,
+    thread: Optional[ThreadType] = None,
     default_headers: Optional[bool] = None,
     curl_options: Optional[dict] = None,
     http_version: Optional[CurlHttpVersion] = None,

curl_cffi/requests/session.py

@@ -9,7 +9,7 @@
 from functools import partialmethod
 from io import BytesIO
 from json import dumps
-from typing import Callable, Dict, List, Any, Optional, Sequence, Tuple, Union, cast, TYPE_CHECKING
+from typing import Callable, Dict, List, Any, Optional, TypedDict, Tuple, Union, cast, TYPE_CHECKING, Literal
 from urllib.parse import ParseResult, parse_qsl, unquote, urlencode, urlparse
 from concurrent.futures import ThreadPoolExecutor
 
@@ -33,7 +33,6 @@
     pass
 
 if TYPE_CHECKING:
-    from typing_extensions import TypedDict
 
     class ProxySpec(TypedDict, total=False):
         all: str
@@ -45,6 +44,7 @@ class ProxySpec(TypedDict, total=False):
 else:
     ProxySpec = Dict[str, str]
 
+ThreadType = Literal["eventlet", "gevent"]
 
 class BrowserType(str, Enum):
     edge99 = "edge99"
@@ -561,17 +561,14 @@ def _check_session_closed(self):
             raise SessionClosed("Session is closed, cannot send request.")
 
 
-# ThreadType = Literal["eventlet", "gevent", None]
-
-
 class Session(BaseSession):
     """A request session, cookies and connections will be reused. This object is thread-safe,
     but it's recommended to use a seperate session for each thread."""
 
     def __init__(
         self,
         curl: Optional[Curl] = None,
-        thread: Optional[str] = None,
+        thread: Optional[ThreadType] = None,
         use_thread_local_curl: bool = True,
         **kwargs,
     ):

scripts/bump_version.sh

@@ -5,9 +5,6 @@ VERSION=$1
 # Makefile
 gsed "s/^VERSION := .*/VERSION := ${VERSION}/g" -i Makefile
 
-# curl_cffi/__version__.py
-gsed "s/^__version__ = .*/__version__ = \"${VERSION}\"/g" -i curl_cffi/__version__.py
-
 # pyproject.toml
 gsed "s/^version = .*/version = \"${VERSION}\"/g" -i pyproject.toml