Add backdated support for Python 3.7 so it's supported in jupyter.org and Google colab notebooks

Author: mythz

requirements.txt

@@ -1,5 +1,6 @@
-requests         >= 2.25.1
-dataclasses      >= 0.6
-dataclasses-json >= 0.5.4
-marshmallow      >= 3.12.2
-setuptools       >= 57.1.0
+typing_extensions >= 3.7.4
+requests          >= 2.23.0
+dataclasses       >= 0.6
+dataclasses-json  >= 0.5.4
+marshmallow       >= 3.12.2
+setuptools        >= 57.1.0

servicestack/clients.py

@@ -2,7 +2,8 @@
 import json
 from dataclasses import dataclass, field
 from enum import Enum
-from typing import Callable, Type, Union, get_origin, ForwardRef
+from typing_extensions import Type, get_origin
+from typing import Callable, Union, ForwardRef
 from typing import TypeVar, Optional, Dict, List, Any
 from urllib.parse import urljoin, quote_plus
 
@@ -91,7 +92,7 @@ def qsvalue(arg):
     return quote_plus(str(arg))
 
 
-def append_querystring(url: str, args: dict[str, Any]):
+def append_querystring(url: str, args: Dict[str, Any]):
     if args:
         for key in args:
             val = args[key]
@@ -113,13 +114,13 @@ def has_request_body(method: str):
 @dataclass
 class SendContext:
     session: Optional[requests.Session] = None
-    headers: dict[str, str] = field(default_factory=dict)
+    headers: Dict[str, str] = field(default_factory=dict)
     method: str = None
     url: Optional[str] = None
     request: Optional[Union[IReturn, IReturnVoid, List[IReturn], List[IReturnVoid]]] = None
     body: Optional[Any] = None
     body_string: Optional[str] = None
-    args: Optional[dict[str, str]] = None
+    args: Optional[Dict[str, str]] = None
     response_as: type = None
     request_filter: Callable[[Any], None] = None
     response_filter: Callable[[Response], None] = None
@@ -270,29 +271,29 @@ def to_absolute_url(self, path_or_url: str):
             return path_or_url
         return urljoin(self.base_url, path_or_url)
 
-    def get_url(self, path: str, response_as: Type, args: dict[str, Any] = None):
+    def get_url(self, path: str, response_as: Type, args: Dict[str, Any] = None):
         return self.send_url(path, "GET", response_as, None, args)
 
-    def delete_url(self, path: str, response_as: Type, args: dict[str, Any] = None):
+    def delete_url(self, path: str, response_as: Type, args: Dict[str, Any] = None):
         return self.send_url(path, "DELETE", response_as, None, args)
 
-    def options_url(self, path: str, response_as: Type, args: dict[str, Any] = None):
+    def options_url(self, path: str, response_as: Type, args: Dict[str, Any] = None):
         return self.send_url(path, "OPTIONS", response_as, None, args)
 
-    def head_url(self, path: str, response_as: Type, args: dict[str, Any] = None):
+    def head_url(self, path: str, response_as: Type, args: Dict[str, Any] = None):
         return self.send_url(path, "HEAD", response_as, None, args)
 
-    def post_url(self, path: str, body: Any = None, response_as: Type = None, args: dict[str, Any] = None):
+    def post_url(self, path: str, body: Any = None, response_as: Type = None, args: Dict[str, Any] = None):
         return self.send_url(path, "POST", response_as, body, args)
 
-    def put_url(self, path: str, body: Any = None, response_as: Type = None, args: dict[str, Any] = None):
+    def put_url(self, path: str, body: Any = None, response_as: Type = None, args: Dict[str, Any] = None):
         return self.send_url(path, "PUT", response_as, body, args)
 
-    def patch_url(self, path: str, body: Any = None, response_as: Type = None, args: dict[str, Any] = None):
+    def patch_url(self, path: str, body: Any = None, response_as: Type = None, args: Dict[str, Any] = None):
         return self.send_url(path, "PATCH", response_as, body, args)
 
     def send_url(self, path: str, method: str = None, response_as: Type = None, body: Any = None,
-                 args: dict[str, Any] = None):
+                 args: Dict[str, Any] = None):
 
         if body and not response_as:
             response_as = _resolve_response_type(body)
@@ -359,7 +360,7 @@ def send_all(self, request_dtos: List[IReturn[T]]):
             body=None,
             body_string=None,
             args=None,
-            response_as=list.__class_getitem__(item_response_as)))
+            response_as=list.__class_getitem__(item_response_as)))  # requires 3.9
 
     def send_all_oneway(self, request_dtos: list):
         request, item_response_as = self.assert_valid_batch_request(request_dtos)
@@ -374,7 +375,7 @@ def send_all_oneway(self, request_dtos: list):
             body=None,
             body_string=None,
             args=None,
-            response_as=list.__class_getitem__(item_response_as)))
+            response_as=list.__class_getitem__(item_response_as)))  # requires 3.9
 
     def _resend_request(self, info: SendContext):
 

servicestack/log.py

@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 from enum import Enum
+from typing import List
 
 
 class LogLevel(str, Enum):
@@ -28,7 +29,7 @@ def log(self, level: LogLevel, msg: str, e: Exception = None):
 
 
 class Log:
-    levels: list[LogLevel] = [LogLevel.WARN, LogLevel.ERROR]
+    levels: List[LogLevel] = [LogLevel.WARN, LogLevel.ERROR]
     logger: Logger = ConsoleLogger()
 
     @staticmethod

servicestack/reflection.py

@@ -14,7 +14,8 @@
 from enum import Enum, IntEnum, EnumMeta
 from functools import reduce
 from types import MappingProxyType
-from typing import Callable, Type, get_origin, ForwardRef, Union, TypeVar, get_args
+from typing_extensions import Type, get_origin, get_args
+from typing import Callable, ForwardRef, Union, TypeVar
 from typing import List, Dict, Any
 
 import marshmallow.fields as mf
@@ -175,8 +176,8 @@ def to_json(obj: Any, indent=None):
 
 
 class TypeConverters:
-    serializers: dict[Type, Callable[[Any], Any]]
-    deserializers: dict[Type, Callable[[Any], Any]]
+    serializers = {}    # Py3.9: dict[Type, Callable[[Any], Any]]
+    deserializers = {}  # Py3.9: dict[Type, Callable[[Any], Any]]
 
     @staticmethod
     def register(cls: Type, serializer: Callable[[Any], Any] = None, deserializer: Callable[[Any], Any] = None):

setup.py

@@ -5,11 +5,12 @@
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
-dependencies = ['requests>=2.25.1', 'dataclasses>=0.6', 'dataclasses-json>=0.5.4', 'marshmallow>=3.12.2']
+dependencies = ['typing_extensions>=3.7.4', 'requests>=2.23.0', 'dataclasses>=0.6', 'dataclasses-json>=0.5.4',
+                'marshmallow>=3.12.2']
 
 setuptools.setup(
     name="servicestack",
-    version="0.0.8",
+    version="0.1.1",
     author="ServiceStack, Inc.",
     author_email="[email protected]",
     description="ServiceStack Python Service Clients",
@@ -20,15 +21,17 @@
     keywords='servicestack,client,dotnet',
     install_requires=dependencies,
     packages=setuptools.find_packages(),
-    tests_require=['pytest', 'dataclasses>=0.6', 'dataclasses-json>=0.5.4', 'requests>=2.25.1'],
+    tests_require=['pytest', 'dataclasses>=0.6', 'dataclasses-json>=0.5.4', 'requests>=2.23.0'],
     classifiers=[
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
         "Operating System :: OS Independent",
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],
     py_modules=["servicestack"],
-    python_requires='>=3.9',
+    python_requires='>=3.7',
 )

tests/test_client.py

@@ -337,6 +337,7 @@ def test_can_deserialize_custom_generic_response_type(self):
         all_names = list(map(lambda x: x.name, response.results))
         self.assertLessEqual(all_names, ["item 1", "item 2"])
 
+    # requires Python 3.9
     def test_can_send_all_batch_request(self):
         client = create_test_client()
         client.response_filter = lambda res: self.assertEqual(res.headers["X-AutoBatch-Completed"], "3")
@@ -345,12 +346,14 @@ def test_can_send_all_batch_request(self):
         self.assertListEqual(list(map(lambda x: x.result, responses)),
                              ['Hello, foo!', 'Hello, bar!', 'Hello, baz!'])
 
+    # requires Python 3.9
     def test_can_send_all_oneway_IReturn_batch_request(self):
         client = create_test_client()
         client.request_filter = lambda req: self.assertTrue(req.url.endswith("/json/oneway/Hello[]"))
         requests = list(map(lambda name: Hello(name=name), ["foo", "bar", "baz"]))
         client.send_all_oneway(requests)
 
+    # requires Python 3.9
     def test_can_send_all_oneway_IReturnVoid_batch_request(self):
         client = create_test_client()
         client.request_filter = lambda req: self.assertTrue(req.url.endswith("/json/oneway/HelloReturnVoid[]"))

tests/test_client_auth.py

@@ -68,13 +68,12 @@ def test_can_use_on_authentication_required_to_auth_client(self):
     def test_can_use_on_authentication_required_to_fetch_token(self):
         client = create_test_client()
         state = State()
+        auth_client = create_test_client()
 
-        client.on_authentication_required = lambda c=client, s=state: [
+        client.on_authentication_required = lambda c=client, a=auth_client, s=state: [
             s.incr(),
-            auth_client := create_test_client(),
-            auth_client.set_credentials("test", "test"),
-            response := cast(AuthenticateResponse, auth_client.get(Authenticate())),
-            client.set_bearer_token(response.bearer_token)
+            a.set_credentials("test", "test"),
+            client.set_bearer_token(cast(AuthenticateResponse, a.get(Authenticate())).bearer_token)
         ]
 
         client.get(TestAuth())
@@ -86,8 +85,7 @@ def test_can_use_on_authentication_required_to_fetch_token_after_expired_token(s
 
         client.on_authentication_required = lambda c=client, s=state: [
             s.incr(),
-            fresh_jwt := cast(CreateJwtResponse, c.post(create_jwt())),
-            c.set_bearer_token(fresh_jwt.token)
+            c.set_bearer_token(cast(CreateJwtResponse, c.post(create_jwt())).token)
         ]
 
         create_expired_jwt = create_jwt()