Python 2 backwards support with types

Author: rkoopmans

tinify/__init__.py

@@ -114,23 +114,23 @@ def from_url(self, url):
 if TYPE_CHECKING:
     # Help the type checker here, as we overrride the module with a singleton object.
     def get_client(): # type: () -> Client
-        ...
+        pass
     key = None  # type: Optional[str]
     app_identifier = None  # type: Optional[str]
     proxy = None  # type: Optional[str]
     compression_count = None  # type: Optional[int]
 
     def validate():  # type: () -> bool
-        ...
+        pass
 
     def from_file(path):  # type: (str) -> Source
-        ...
+        pass
 
     def from_buffer(string):  # type: (bytes) -> Source
-        ...
+        pass
 
     def from_url(url):  # type: (str) -> Source
-        ...
+        pass
 
 
 # Overwrite current module with singleton object.

tinify/source.py

@@ -2,44 +2,17 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import tinify
-from . import Result, ResultMeta
+import sys
+from tinify.result import Result
+from tinify.result_meta import ResultMeta
 
 try:
-    from typing import Union, Dict, IO, Any, TypedDict, List, Literal, Optional, Unpack, TYPE_CHECKING, overload
-
-    class ResizeOptions(TypedDict, total=False):
-        method: Literal['scale', 'fit', 'cover', 'thumb']
-        width: int
-        height: int
-
-    ConvertTypes = Literal['image/webp', 'image/jpeg', 'image/png', "image/avif", "*/*"]
-    class ConvertOptions(TypedDict, total=False):
-        type: Union[ConvertTypes, List[ConvertTypes]]
-
-    class TransformOptions(TypedDict, total=False):
-        background: str | Literal["white", "black"]
-
-    class S3StoreOptions(TypedDict, total=False):
-        service: Literal['s3']
-        aws_access_key_id: str
-        aws_secret_access_key: str
-        region: str
-        path: str
-        headers: Optional[Dict[str, str]]
-        acl: Optional[Literal["no-acl"]]
-
-    class GCSStoreOptions(TypedDict, total=False):
-        service: Literal['gcs']
-        gcp_access_token: str
-        path: str
-        headers: Optional[Dict[str, str]]
-
-    PreserveOption = Literal['copyright', 'creation', 'location']
+    from typing import Union, Dict, IO, Any, List, Literal, Optional, Unpack, TYPE_CHECKING, overload
+    if sys.version_info.major > 3 and sys.version_info.minor > 8:
+        from  tinify.typed import *
 except ImportError:
     TYPE_CHECKING = False # type: ignore
 
-
-
 class Source(object):
     @classmethod
     def from_file(cls, path):  # type: (Union[str, IO]) -> Source
@@ -81,11 +54,11 @@ def transform(self, **options):  # type: (Unpack[TransformOptions]) -> "Source"
     if TYPE_CHECKING:
         @overload
         def store(self, **options): # type: (Unpack[S3StoreOptions]) -> ResultMeta
-            ...
+            pass
 
         @overload
         def store(self, **options): # type: (Unpack[GCSStoreOptions]) -> ResultMeta
-            ...
+            pass
 
     def store(self, **options):  # type: (Any) -> ResultMeta
         response = tinify.get_client().request('POST', self.url, self._merge_commands(store=options))

tinify/typed.py

@@ -0,0 +1,30 @@
+from typing import Union, Dict, List, Literal, Optional, TypedDict
+
+class ResizeOptions(TypedDict,total=False):
+    method: Literal['scale', 'fit', 'cover', 'thumb']
+    width: int
+    height: int
+
+ConvertTypes = Literal['image/webp', 'image/jpeg', 'image/png', "image/avif", "*/*"]
+class ConvertOptions(TypedDict, total=False):
+    type: Union[ConvertTypes, List[ConvertTypes]]
+
+class TransformOptions(TypedDict, total=False):
+    background: Union[str, Literal["white", "black"]]
+
+class S3StoreOptions(TypedDict, total=False):
+    service: Literal['s3']
+    aws_access_key_id: str
+    aws_secret_access_key: str
+    region: str
+    path: str
+    headers: Optional[Dict[str, str]]
+    acl: Optional[Literal["no-acl"]]
+
+class GCSStoreOptions(TypedDict, total=False):
+    service: Literal['gcs']
+    gcp_access_token: str
+    path: str
+    headers: Optional[Dict[str, str]]
+
+PreserveOption = Literal['copyright', 'creation', 'location']