swizzle 2.3.2__py3-none-any.whl → 2.4.0__py3-none-any.whl

swizzle/__init__.py

@@ -4,8 +4,9 @@ import builtins
 import sys as _sys
 import types
 import unicodedata
-from enum import EnumType
+from enum import EnumMeta
 from functools import wraps
+from importlib.metadata import version as get_version
 from keyword import iskeyword as _iskeyword
 from operator import itemgetter as _itemgetter
 
@@ -16,21 +17,32 @@ try:
 except ImportError:
     _tuplegetter = lambda index, doc: property(_itemgetter(index), doc=doc)
 
-_type = builtins.type
 
-__version__ = "2.3.2"
+try:
+    from importlib.metadata import PackageNotFoundError
+    from importlib.metadata import version as _version
+
+    __version__ = _version("swizzle")
+except PackageNotFoundError:
+    try:
+        from setuptools_scm import get_version
 
+        __version__ = get_version(root=".", relative_to=__file__)
+    except Exception:
+        __version__ = "0.0.0-dev"
+
+_type = builtins.type
 MISSING = object()
 
 
 def swizzledtuple(
     typename,
     field_names,
+    arrange_names=None,
     *,
     rename=False,
     defaults=None,
     module=None,
-    arrange_names=None,
     sep=None,
 ):
     """
@@ -175,7 +187,7 @@ def swizzledtuple(
     if num_fields == 1:
         arg_list += ","
     repr_fmt = "(" + ", ".join(f"{name}=%r" for name in arrange_names) + ")"
-    _dict, _tuple, _len, _map, _zip = dict, tuple, len, map, zip
+    _dict, _tuple, _len, _zip = dict, tuple, len, zip
 
     namespace = {
         "_tuple_new": tuple_new,
@@ -441,8 +453,16 @@ def swizzle_attributes_retriever(
                         )
 
             if type == swizzledtuple:
-                field_names = set(arranged_names)
-                field_values = [retrieve_attribute(obj, name) for name in field_names]
+
+                seen = set()
+                field_names, field_values = zip(
+                    *[
+                        (name, matched_attributes[i])
+                        for i, name in enumerate(arranged_names)
+                        if name not in seen and not seen.add(name)
+                    ]
+                )
+
                 name = "swizzledtuple"
                 if hasattr(obj, "__name__"):
                     name = obj.__name__
@@ -500,7 +520,7 @@ def swizzle(cls=None, meta=False, sep=None, type=tuple, only_attrs=None):
             class SwizzledMetaType(meta_cls):
                 pass
 
-            if meta_cls == EnumType:
+            if meta_cls == EnumMeta:
 
                 def cfem_dummy(*args, **kwargs):
                     pass
@@ -511,7 +531,7 @@ def swizzle(cls=None, meta=False, sep=None, type=tuple, only_attrs=None):
             class SwizzledClass(cls, metaclass=SwizzledMetaType):
                 pass
 
-            if meta_cls == EnumType:
+            if meta_cls == EnumMeta:
                 SwizzledMetaType._check_for_existing_members_ = cfem
 
             # Preserve metadata on swizzled meta and class

{swizzle-2.3.2.dist-info → swizzle-2.4.0.dist-info}/METADATA

@@ -1,33 +1,23 @@
 Metadata-Version: 2.4
 Name: swizzle
-Version: 2.3.2
+Version: 2.4.0
 Summary: Swizzle enables the retrieval of multiple attributes, similar to swizzling in computer graphics.
-Home-page: https://github.com/janthmueller/swizzle
-Author: Jan T. Müller
-Author-email: mail@jantmueller.com
+Author-email: "Jan T. Müller" <mail@jantmueller.com>
 License: MIT
-Project-URL: Documentation, https://github.com/janthmueller/swizzle/blob/main/README.md
-Project-URL: Source, https://github.com/janthmueller/swizzle
-Project-URL: Tracker, https://github.com/janthmueller/swizzle/issues
+Project-URL: homepage, https://github.com/janthmueller/swizzle
+Project-URL: documentation, https://github.com/janthmueller/swizzle/blob/main/README.md
+Project-URL: source, https://github.com/janthmueller/swizzle
+Project-URL: tracker, https://github.com/janthmueller/swizzle/issues
+Keywords: swizzle,attributes,graphics,development
 Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
 Dynamic: license-file
-Dynamic: project-url
-Dynamic: requires-python
-Dynamic: summary
 
 # Swizzle
 
@@ -134,7 +124,7 @@ Create swizzled named tuples inspired by `namedtuple`:
 ```python
 from swizzle import swizzledtuple
 
-Vector = swizzledtuple('Vector', 'x y z')
+Vector = swizzledtuple('Vector', 'x y z') # Equivalent to swizzle.t('Vector', 'x y z')
 
 v = Vector(1, 2, 3)
 

swizzle-2.4.0.dist-info/RECORD

@@ -0,0 +1,7 @@
+swizzle/__init__.py,sha256=-TULOghrDcJWrIHvSG_j7r2_PxTaB_kxU3oVis5dBHw,20636
+swizzle/trie.py,sha256=fa5iRR-6dZ8nHsuqalGxH40uYiP5Ge7Kc4r51aCOwbk,1355
+swizzle-2.4.0.dist-info/licenses/LICENSE,sha256=WDAegKWtl3rZUiN-SQ2FEQQwEFxlM_jEKQyJRJawJXo,1070
+swizzle-2.4.0.dist-info/METADATA,sha256=tiejU_zOQ6gK73kfuIW9p4jaJr6cXj0Jjkyc8Y-7WIM,5575
+swizzle-2.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+swizzle-2.4.0.dist-info/top_level.txt,sha256=XFSQti81x2zM0zAMCY1YD0lqB1eSg5my9BB03uFgCic,8
+swizzle-2.4.0.dist-info/RECORD,,

swizzle-2.3.2.dist-info/RECORD

@@ -1,7 +0,0 @@
-swizzle/__init__.py,sha256=qPf9IXyZ3JGA2nVM_fCcsxluoxxHumIfHHkL-VE5MZg,20040
-swizzle/trie.py,sha256=fa5iRR-6dZ8nHsuqalGxH40uYiP5Ge7Kc4r51aCOwbk,1355
-swizzle-2.3.2.dist-info/licenses/LICENSE,sha256=WDAegKWtl3rZUiN-SQ2FEQQwEFxlM_jEKQyJRJawJXo,1070
-swizzle-2.3.2.dist-info/METADATA,sha256=wDotyAgFlMThAENLwZYkEoEhR_QiO2NcOXqylkzVQdc,5684
-swizzle-2.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-swizzle-2.3.2.dist-info/top_level.txt,sha256=XFSQti81x2zM0zAMCY1YD0lqB1eSg5my9BB03uFgCic,8
-swizzle-2.3.2.dist-info/RECORD,,