aldict 1.0.0__tar.gz → 1.0.2__tar.gz

{aldict-1.0.0 → aldict-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aldict
-Version: 1.0.0
+Version: 1.0.2
 Summary: Multi-key dictionary, supports adding and manipulating key-aliases pointing to shared values
 Author-email: Kaloyan Ivanov <kaloyan.ivanov88@gmail.com>
 Project-URL: repository, https://github.com/kaliv0/aldict
@@ -25,6 +25,7 @@ Requires-Dist: twine>=6.0.1; extra == "dev"
 ![Python 3.x](https://img.shields.io/badge/python-^3.11-blue?style=flat-square&logo=Python&logoColor=white)
 [![PyPI](https://img.shields.io/pypi/v/aldict.svg)](https://pypi.org/project/aldict/)
 [![License](https://img.shields.io/badge/License-MIT-yellow?style=flat-square)](https://github.com/kaliv0/aldict/blob/main/LICENSE)
+[![Downloads](https://static.pepy.tech/badge/aldict)](https://pepy.tech/projects/aldict)
 
 Multi-key dictionary, supports adding and manipulating key-aliases pointing to shared values
 
@@ -102,3 +103,12 @@ assert list(ad.items()) == [('x', 10), ('Xx', 10)]
 ```python
 assert list(ad.origin_keys()) == ['x', 'y']
 ```
+- origin_len
+<br>(get original dict <i>length</i> without aliases)
+```python
+ad = AliasDict({"a": 1, "b": 2})
+ad.add_alias("a", "aa")
+assert list(ad.keys()) == ["a", "b", "aa"]
+assert len(ad) == 3
+assert ad.origin_len() == 2
+```

{aldict-1.0.0 → aldict-1.0.2}/README.md

@@ -9,6 +9,7 @@
 ![Python 3.x](https://img.shields.io/badge/python-^3.11-blue?style=flat-square&logo=Python&logoColor=white)
 [![PyPI](https://img.shields.io/pypi/v/aldict.svg)](https://pypi.org/project/aldict/)
 [![License](https://img.shields.io/badge/License-MIT-yellow?style=flat-square)](https://github.com/kaliv0/aldict/blob/main/LICENSE)
+[![Downloads](https://static.pepy.tech/badge/aldict)](https://pepy.tech/projects/aldict)
 
 Multi-key dictionary, supports adding and manipulating key-aliases pointing to shared values
 
@@ -85,4 +86,13 @@ assert list(ad.items()) == [('x', 10), ('Xx', 10)]
 <br>(get original <i>keys</i> only)
 ```python
 assert list(ad.origin_keys()) == ['x', 'y']
-```
+```
+- origin_len
+<br>(get original dict <i>length</i> without aliases)
+```python
+ad = AliasDict({"a": 1, "b": 2})
+ad.add_alias("a", "aa")
+assert list(ad.keys()) == ["a", "b", "aa"]
+assert len(ad) == 3
+assert ad.origin_len() == 2
+```

{aldict-1.0.0 → aldict-1.0.2}/aldict/alias_dict.py

@@ -8,9 +8,10 @@ class AliasDict(UserDict):
 
     def __init__(self, dict_):
         self._alias_dict = {}
-        super().__init__(self, **dict_)
+        super().__init__(**dict_)
 
     def add_alias(self, key, *aliases):
+        """Adds one or more aliases to specified key in the dictionary"""
         if key not in self.data.keys():
             raise KeyError(key)
         for alias in aliases:
@@ -19,6 +20,7 @@ class AliasDict(UserDict):
             self._alias_dict[alias] = key
 
     def remove_alias(self, *aliases):
+        """Removes one or more aliases"""
         for alias in aliases:
             try:
                 self._alias_dict.__delitem__(alias)
@@ -26,29 +28,43 @@ class AliasDict(UserDict):
                 raise AliasError(alias) from e
 
     def clear_aliases(self):
+        """Removes all aliases"""
         self._alias_dict.clear()
 
     def aliases(self):
+        """Returns all aliases present in the dictionary"""
         return self._alias_dict.keys()
 
     def aliased_keys(self):
+        """Returns a dictview of all keys with their corresponding aliases"""
         result = defaultdict(list)
         for alias, key in self._alias_dict.items():
             result[key].append(alias)
         return result.items()
 
     def origin_keys(self):
+        """Returns all keys"""
         return self.data.keys()
 
     def keys(self):
+        """Returns all keys and aliases"""
         return dict(**self.data, **self._alias_dict).keys()
 
     def values(self):
+        """Returns all values"""
         return self.data.values()
 
     def items(self):
+        """Returns a dictview with all items (including alias/value tuples)"""
         return dict(**self.data, **{k: self.data[v] for k, v in self._alias_dict.items()}).items()
 
+    def origin_len(self):
+        """Returns the length of the original dictionary (without aliases)"""
+        return len(self.data)
+
+    def __len__(self):
+        return len(self.keys())
+
     def __missing__(self, key):
         try:
             return super().__getitem__(self._alias_dict[key])
@@ -65,10 +81,10 @@ class AliasDict(UserDict):
     def __delitem__(self, key):
         try:
             self.data.__delitem__(key)
+            self._alias_dict = {k: v for k, v in self._alias_dict.items() if v != key}
         except KeyError:
-            # in case we try to delete alias e.g. via pop()
-            pass
-        self._alias_dict = {k: v for k, v in self._alias_dict.items() if v != key}
+            # in case we try to delete alias via pop() or del
+            return self.remove_alias(key)
 
     def __contains__(self, item):
         return item in set(self.keys())
@@ -77,9 +93,6 @@ class AliasDict(UserDict):
         for item in self.keys():
             yield item
 
-    def __len__(self):
-        return len(self.keys())
-
     def __repr__(self):
         return f"AliasDict({self.items()})"
 

{aldict-1.0.0 → aldict-1.0.2}/aldict.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aldict
-Version: 1.0.0
+Version: 1.0.2
 Summary: Multi-key dictionary, supports adding and manipulating key-aliases pointing to shared values
 Author-email: Kaloyan Ivanov <kaloyan.ivanov88@gmail.com>
 Project-URL: repository, https://github.com/kaliv0/aldict
@@ -25,6 +25,7 @@ Requires-Dist: twine>=6.0.1; extra == "dev"
 ![Python 3.x](https://img.shields.io/badge/python-^3.11-blue?style=flat-square&logo=Python&logoColor=white)
 [![PyPI](https://img.shields.io/pypi/v/aldict.svg)](https://pypi.org/project/aldict/)
 [![License](https://img.shields.io/badge/License-MIT-yellow?style=flat-square)](https://github.com/kaliv0/aldict/blob/main/LICENSE)
+[![Downloads](https://static.pepy.tech/badge/aldict)](https://pepy.tech/projects/aldict)
 
 Multi-key dictionary, supports adding and manipulating key-aliases pointing to shared values
 
@@ -102,3 +103,12 @@ assert list(ad.items()) == [('x', 10), ('Xx', 10)]
 ```python
 assert list(ad.origin_keys()) == ['x', 'y']
 ```
+- origin_len
+<br>(get original dict <i>length</i> without aliases)
+```python
+ad = AliasDict({"a": 1, "b": 2})
+ad.add_alias("a", "aa")
+assert list(ad.keys()) == ["a", "b", "aa"]
+assert len(ad) == 3
+assert ad.origin_len() == 2
+```

{aldict-1.0.0 → aldict-1.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "aldict"
-version = "1.0.0"
+version = "1.0.2"
 readme = "README.md"
 authors = [{ name = "Kaloyan Ivanov", email = "kaloyan.ivanov88@gmail.com" }]
 description = "Multi-key dictionary, supports adding and manipulating key-aliases pointing to shared values"

{aldict-1.0.0 → aldict-1.0.2}/tests/test_alias_dict.py

@@ -142,7 +142,7 @@ def test_pop_alias_doesnt_remove_key(alias_dict):
         "import_mod": "yaml",
         "read_mode": "r",
     }
-    assert ".yaml" in alias_dict
+    assert list(alias_dict.keys()) == [".json", ".yaml", ".toml"]
 
 
 def test_iter(alias_dict):
@@ -194,6 +194,11 @@ def test_dict_len_includes_aliases(alias_dict):
     assert len(alias_dict) == 4
 
 
+def test_dict_origin_len_excludes_aliases(alias_dict):
+    assert list(alias_dict.keys()) == [".json", ".yaml", ".toml", ".yml"]
+    assert alias_dict.origin_len() == 3
+
+
 def test_popitem(alias_dict):
     # pops first item -> MutableMapping.popitem()
     assert alias_dict.popitem() == (