Merge branch 'master' of github.com:i2mint/config2py

Author: thorwhalen

config2py/sync_store.py

@@ -34,11 +34,11 @@
 from functools import reduce
 
 __all__ = [
-    'SyncStore',
-    'FileStore',
-    'JsonStore',
-    'register_extension',
-    'get_format_handlers',
+    "SyncStore",
+    "FileStore",
+    "JsonStore",
+    "register_extension",
+    "get_format_handlers",
 ]
 
 # Note: Independent module. No imports from config2py, dol etc.
@@ -70,7 +70,7 @@ def get_format_handlers(
 
 
 # Register standard formats
-register_extension('.json', json.loads, json.dumps)
+register_extension(".json", json.loads, json.dumps)
 
 # TODO: Use register-if-available pattern (with context managers.. implemented somewhere...)
 
@@ -92,17 +92,17 @@ def _ini_dumper(data: dict) -> str:
         parser.write(output)
         return output.getvalue()
 
-    register_extension('.ini', _ini_loader, _ini_dumper)
-    register_extension('.cfg', _ini_loader, _ini_dumper)
+    register_extension(".ini", _ini_loader, _ini_dumper)
+    register_extension(".cfg", _ini_loader, _ini_dumper)
 except ImportError:
     pass
 
 # YAML support (optional)
 try:
     import yaml
 
-    register_extension('.yaml', yaml.safe_load, yaml.dump)
-    register_extension('.yml', yaml.safe_load, yaml.dump)
+    register_extension(".yaml", yaml.safe_load, yaml.dump)
+    register_extension(".yml", yaml.safe_load, yaml.dump)
 except ImportError:
     pass
 
@@ -111,13 +111,13 @@ def _ini_dumper(data: dict) -> str:
     import tomllib  # Python 3.11+
     import tomli_w
 
-    register_extension('.toml', tomllib.loads, tomli_w.dumps)
+    register_extension(".toml", tomllib.loads, tomli_w.dumps)
 except ImportError:
     try:
         import tomli
         import tomli_w
 
-        register_extension('.toml', tomli.loads, tomli_w.dumps)
+        register_extension(".toml", tomli.loads, tomli_w.dumps)
     except ImportError:
         pass
 
@@ -133,7 +133,7 @@ def _normalize_key_path(key_path: KeyPath) -> Tuple[str, ...]:
     if key_path is None or key_path == ():
         return ()
     if isinstance(key_path, str):
-        return tuple(key_path.split('.')) if '.' in key_path else (key_path,)
+        return tuple(key_path.split(".")) if "." in key_path else (key_path,)
     return tuple(key_path)
 
 
@@ -307,7 +307,7 @@ def __init__(
         key_path: KeyPath = None,
         loader: Optional[Callable[[str], dict]] = None,
         dumper: Optional[Callable[[dict], str]] = None,
-        mode: str = 'r',
+        mode: str = "r",
         dump_kwargs: Optional[dict] = None,
         create_file_content: Optional[Callable[[], dict]] = None,
         create_key_path_content: Optional[Callable[[], Any]] = None,
@@ -389,7 +389,7 @@ def _dump_to_file(self, section_data: dict) -> None:
             full_data = _set_nested(full_data, self.key_path, section_data)
             content = self._file_dumper(full_data, **self.dump_kwargs)
 
-        write_mode = 'w' if 'b' not in self.mode else 'wb'
+        write_mode = "w" if "b" not in self.mode else "wb"
         with open(self.filepath, write_mode) as f:
             f.write(content)
 
@@ -421,14 +421,14 @@ def __init__(
         ensure_ascii: bool = False,
         **dump_kwargs,
     ):
-        dump_kwargs.setdefault('indent', indent)
-        dump_kwargs.setdefault('ensure_ascii', ensure_ascii)
+        dump_kwargs.setdefault("indent", indent)
+        dump_kwargs.setdefault("ensure_ascii", ensure_ascii)
 
         super().__init__(
             filepath,
             loader=json.loads,
             dumper=json.dumps,
             key_path=key_path,
-            mode='r',
+            mode="r",
             dump_kwargs=dump_kwargs,
         )

config2py/tests/__init__.py

@@ -1,4 +1,5 @@
 """Init for config2py tests."""
+
 import sys
 
 try:

config2py/tests/test_sync_store.py

@@ -26,19 +26,19 @@ def dumper(data):
     store = SyncStore(loader, dumper)
 
     # Set
-    store['key'] = 'value'
-    assert store['key'] == 'value'
-    assert data_holder[0]['key'] == 'value'
+    store["key"] = "value"
+    assert store["key"] == "value"
+    assert data_holder[0]["key"] == "value"
 
     # Delete
-    del store['key']
-    assert 'key' not in store
-    assert 'key' not in data_holder[0]
+    del store["key"]
+    assert "key" not in store
+    assert "key" not in data_holder[0]
 
     # Iteration
-    store['a'] = 1
-    store['b'] = 2
-    assert set(store) == {'a', 'b'}
+    store["a"] = 1
+    store["b"] = 2
+    assert set(store) == {"a", "b"}
 
     # Length
     assert len(store) == 2
@@ -58,13 +58,13 @@ def dumper(data):
 
     store = SyncStore(loader, dumper)
 
-    store['a'] = 1
+    store["a"] = 1
     assert sync_count[0] == 1
 
-    store['b'] = 2
+    store["b"] = 2
     assert sync_count[0] == 2
 
-    del store['a']
+    del store["a"]
     assert sync_count[0] == 3
 
 
@@ -84,13 +84,13 @@ def dumper(data):
 
     # Batch operations
     with store:
-        store['a'] = 1
-        store['b'] = 2
-        store['c'] = 3
+        store["a"] = 1
+        store["b"] = 2
+        store["c"] = 3
         assert sync_count[0] == 0  # Not synced yet
 
     assert sync_count[0] == 1  # Synced once on exit
-    assert data_holder[0] == {'a': 1, 'b': 2, 'c': 3}
+    assert data_holder[0] == {"a": 1, "b": 2, "c": 3}
 
 
 def test_sync_store_manual_flush():
@@ -108,111 +108,111 @@ def dumper(data):
     store = SyncStore(loader, dumper)
 
     with store:
-        store['a'] = 1
+        store["a"] = 1
         assert sync_count[0] == 0
 
         store.flush()  # Manual flush
         assert sync_count[0] == 1
 
-        store['b'] = 2
+        store["b"] = 2
         assert sync_count[0] == 1  # Still in context, not auto-synced
 
     assert sync_count[0] == 2  # Final flush on exit
 
 
 def test_file_store_json():
     """Test FileStore with JSON file."""
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
+    with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as f:
         f.write('{"key": "value"}')
         temp_file = f.name
 
     try:
         store = FileStore(temp_file)
 
         # Read
-        assert store['key'] == 'value'
+        assert store["key"] == "value"
 
         # Write
-        store['new_key'] = 'new_value'
+        store["new_key"] = "new_value"
 
         # Verify persistence
         with open(temp_file) as f:
             data = json.load(f)
-        assert data['new_key'] == 'new_value'
+        assert data["new_key"] == "new_value"
 
         # Delete
-        del store['key']
-        assert 'key' not in store
+        del store["key"]
+        assert "key" not in store
 
     finally:
         Path(temp_file).unlink()
 
 
 def test_file_store_key_path():
     """Test FileStore with nested key_path."""
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
+    with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as f:
         f.write('{"section1": {"a": 1}, "section2": {"b": 2}}')
         temp_file = f.name
 
     try:
         # Work with section1 only
-        section1 = FileStore(temp_file, key_path='section1')
+        section1 = FileStore(temp_file, key_path="section1")
 
-        assert section1['a'] == 1
-        section1['c'] = 3
-        assert 'c' in section1
+        assert section1["a"] == 1
+        section1["c"] = 3
+        assert "c" in section1
 
         # Verify section2 untouched
         with open(temp_file) as f:
             data = json.load(f)
-        assert data['section2'] == {'b': 2}
-        assert data['section1']['c'] == 3
+        assert data["section2"] == {"b": 2}
+        assert data["section1"]["c"] == 3
 
     finally:
         Path(temp_file).unlink()
 
 
 def test_file_store_dotted_key_path():
     """Test FileStore with dotted key_path notation."""
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
+    with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as f:
         f.write('{"a": {"b": {"c": {}}}}')
         temp_file = f.name
 
     try:
-        nested = FileStore(temp_file, key_path='a.b.c')
-        nested['key'] = 'value'
+        nested = FileStore(temp_file, key_path="a.b.c")
+        nested["key"] = "value"
 
         with open(temp_file) as f:
             data = json.load(f)
-        assert data['a']['b']['c']['key'] == 'value'
+        assert data["a"]["b"]["c"]["key"] == "value"
 
     finally:
         Path(temp_file).unlink()
 
 
 def test_json_store():
     """Test JsonStore with defaults."""
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
+    with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as f:
         f.write('{"key": "value"}')
         temp_file = f.name
 
     try:
         store = JsonStore(temp_file)
-        store['new'] = 'data'
+        store["new"] = "data"
 
         # Check formatting (indent=2 by default)
         with open(temp_file) as f:
             content = f.read()
-        assert '  ' in content  # Should have indentation
+        assert "  " in content  # Should have indentation
 
     finally:
         Path(temp_file).unlink()
 
 
 def test_file_store_batch_operations():
     """Test that batch operations work efficiently."""
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
-        f.write('{}')
+    with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as f:
+        f.write("{}")
         temp_file = f.name
 
     try:
@@ -221,13 +221,13 @@ def test_file_store_batch_operations():
         # Batch mode - only one write
         with store:
             for i in range(100):
-                store[f'key_{i}'] = i
+                store[f"key_{i}"] = i
 
         # Verify all written
         with open(temp_file) as f:
             data = json.load(f)
         assert len(data) == 100
-        assert data['key_42'] == 42
+        assert data["key_42"] == 42
 
     finally:
         Path(temp_file).unlink()
@@ -238,20 +238,20 @@ def test_extension_registry():
 
     # Register custom format
     def custom_loader(content):
-        return {'loaded': content}
+        return {"loaded": content}
 
     def custom_dumper(data):
         return str(data)
 
-    register_extension('.custom', custom_loader, custom_dumper)
+    register_extension(".custom", custom_loader, custom_dumper)
 
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.custom', delete=False) as f:
-        f.write('test content')
+    with tempfile.NamedTemporaryFile(mode="w", suffix=".custom", delete=False) as f:
+        f.write("test content")
         temp_file = f.name
 
     try:
         store = FileStore(temp_file)
-        assert store['loaded'] == 'test content'
+        assert store["loaded"] == "test content"
 
     finally:
         Path(temp_file).unlink()
@@ -261,27 +261,27 @@ def test_store_repr():
     """Test string representations."""
     data_holder = [{}]
     store = SyncStore(lambda: data_holder[0], lambda d: None)
-    assert 'SyncStore' in repr(store)
+    assert "SyncStore" in repr(store)
 
-    with tempfile.NamedTemporaryFile(mode='w', suffix='.json', delete=False) as f:
+    with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as f:
         f.write('{"section": {}}')  # Include section key
         temp_file = f.name
 
     try:
         file_store = FileStore(temp_file)
-        assert 'FileStore' in repr(file_store)
+        assert "FileStore" in repr(file_store)
         assert temp_file in repr(file_store)
 
-        file_store_with_path = FileStore(temp_file, key_path='section')
-        assert 'key_path' in repr(file_store_with_path)
+        file_store_with_path = FileStore(temp_file, key_path="section")
+        assert "key_path" in repr(file_store_with_path)
 
     finally:
         Path(temp_file).unlink()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     if PYTEST_AVAILABLE:
-        pytest.main([__file__, '-v'])
+        pytest.main([__file__, "-v"])
     else:
         # Run tests manually
         print("Running tests without pytest...")

config2py/tests/utils_for_testing.py

@@ -1,4 +1,5 @@
 """Utils for testing config2py functionality."""
+
 from functools import partial