bantam 2.4.44__tar.gz → 2.4.45__tar.gz

{bantam-2.4.44 → bantam-2.4.45}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: bantam
-Version: 2.4.44
+Version: 2.4.45
 Summary: small utils to automate web interface in Python
 Home-page: https://github.com/nak/bantam
-Download-URL: https://github.com/bantam/dist/2.4.44
+Download-URL: https://github.com/bantam/dist/2.4.45
 Author: John Rusnak
 Author-email: john.j.rusnak@att.net
 License: BSD 2-CLAUSE

{bantam-2.4.44 → bantam-2.4.45}/setup.py

@@ -2,7 +2,7 @@ import os
 
 import setuptools
 
-VERSION = "2.4.44"
+VERSION = "2.4.45"
 
 setuptools.setup(
     name='bantam',

{bantam-2.4.44 → bantam-2.4.45}/src/bantam/conversions.py

@@ -54,6 +54,8 @@ def normalize_to_json_compat(val: Any) -> Any:
         json_data = []
         for value in val:
             json_data.append(normalize_to_json_compat(value))
+    elif hasattr(val, '__getstate__'):
+        json_data = val.__getstate__()
     else:
         try:
             return normalize_to_json_compat([int(b) for b in pickle.dumps(val)])
@@ -87,6 +89,8 @@ def full_type(annotation: Any) -> tuple[Any, tuple[Type, ...]]:
             return base, annotation.__args__
         elif hasattr(annotation, '__dataclass_fields__'):
             return annotation, tuple()
+        elif hasattr(base, '__getstate__'):
+            return base, tuple()
         else:
             raise TypeError(f"Unsupported type for web api: '{annotation}'.  "
                             "Parameterizable types must include type specifics")
@@ -176,8 +180,8 @@ def normalize_from_json(json_data, typ: Any) -> Any:
                 name: normalize_from_json(json_data[name], field.type)
                 for name, field in typ.__dataclass_fields__.items()
             })
-        elif hasattr(typ, '__setstate__'):
-            result = typ.__new__(typ)
+        elif hasattr(true_type, '__setstate__'):
+            result = true_type.__new__(true_type)
             result.__setstate__(json_data)
             return result
         else:

{bantam-2.4.44 → bantam-2.4.45}/src/bantam.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: bantam
-Version: 2.4.44
+Version: 2.4.45
 Summary: small utils to automate web interface in Python
 Home-page: https://github.com/nak/bantam
-Download-URL: https://github.com/bantam/dist/2.4.44
+Download-URL: https://github.com/bantam/dist/2.4.45
 Author: John Rusnak
 Author-email: john.j.rusnak@att.net
 License: BSD 2-CLAUSE

{bantam-2.4.44 → bantam-2.4.45}/test/test_conversions.py

@@ -6,15 +6,17 @@ import uuid
 from collections import OrderedDict
 from dataclasses import dataclass
 from pathlib import Path, PosixPath
-from typing import Dict, List, Union, Tuple, Set, Optional
+from typing import Dict, List, Union, Tuple, Set, Optional, Generic, TypeVar
 
 import pytest
 from frozenlist import FrozenList
 from frozendict import frozendict
 
 from bantam.conversions import to_str, from_str, normalize_from_json
+T = TypeVar('T')
 
-class Pickleable:
+
+class Pickleable(Generic[T]):
 
     def __init__(self, host: str = None, port: int = None, semaphore = None):
         self.host = host or "localhost"
@@ -102,10 +104,10 @@ class Test:
         })
 
     def test_pickleable_from_str(self):
-        item = Pickleable()
+        item: Pickleable[int] = Pickleable()
         text = to_str(item)
         assert json.loads(text) == {'host': 'localhost', 'port': 12345}
-        item2 = normalize_from_json(json.loads(text), Pickleable)
+        item2 = normalize_from_json(json.loads(text), Pickleable[int])
         assert item2.host == "localhost"
         assert item2.port == 12345
         assert isinstance(item.semaphore, threading.Semaphore)