swizzle 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

swizzle/__init__.py

@@ -1,11 +1,16 @@
 from functools import wraps
 import sys
 import types
-import inspect
 
-__version__ = "0.1.0"
+__version__ = "0.1.2"
 
-def _swizzle(func):
+def _split(s, sep):
+    if sep == '':
+        return list(s)
+    else:
+        return s.split(sep)
+    
+def _swizzle(func, sep = None):
     def _getattr(obj, name, default=object()):
         try:
             return func(obj, name)
@@ -15,29 +20,37 @@ def _swizzle(func):
     @wraps(func)
     def _swizzle_attributes(obj, name):
         """Find attributes of an object that match substrings of a given name."""
-        found_attributes = []
-        sentinel = object()
-        i = 0
-        while i < len(name):
-            match_found = False
-            for j in range(len(name), i, -1):
-                substr = name[i:j]
-                attr = _getattr(obj, substr, sentinel)
-                if attr is not sentinel:
-                    found_attributes.append(attr)
-                    i = j  # Move index to end of the matched substring
-                    match_found = True
-                    break
-            if not match_found:
-                raise AttributeError(f"No matching attribute found for substring: {name[i:]}")
-        return tuple(found_attributes)
+        try:
+            return func(obj, name)
+        except AttributeError:
+            pass
+        if sep is not None:
+            names = _split(name, sep)
+            found_attributes = [func(obj, n) for n in names]
+        else:
+            found_attributes = []
+            sentinel = object()
+            i = 0
+            while i < len(name):
+                match_found = False
+                for j in range(len(name), i, -1):
+                    substr = name[i:j]
+                    attr = _getattr(obj, substr, sentinel)
+                    if attr is not sentinel:
+                        found_attributes.append(attr)
+                        i = j  # Move index to end of the matched substring
+                        match_found = True
+                        break
+                if not match_found:
+                    raise AttributeError(f"No matching attribute found for substring: {name[i:]}")
+        return tuple(found_attributes) 
     return _swizzle_attributes
     
-def swizzle(cls=None, meta = False):
+def swizzle(cls=None, meta = False, sep = None):
     def decorator(cls):
         # Decorate the class's __getattr__ or __getattribute__
         cls_fn = cls.__getattr__ if hasattr(cls, '__getattr__') else cls.__getattribute__
-        setattr(cls, cls_fn.__name__, _swizzle(cls_fn)) 
+        setattr(cls, cls_fn.__name__, _swizzle(cls_fn, sep)) 
 
         # Handle the meta class
         if meta:
@@ -47,7 +60,7 @@ def swizzle(cls=None, meta = False):
                 meta_cls = SwizzleType
                 cls = meta_cls(cls.__name__, cls.__bases__, dict(cls.__dict__))
             meta_fn = meta_cls.__getattr__ if hasattr(meta_cls, '__getattr__') else meta_cls.__getattribute__
-            setattr(meta_cls, meta_fn.__name__, _swizzle(meta_fn))
+            setattr(meta_cls, meta_fn.__name__, _swizzle(meta_fn, sep))
         return cls
 
     if cls is None:
@@ -55,16 +68,13 @@ def swizzle(cls=None, meta = False):
     else:
         return decorator(cls)
         
-
-
-# make swizzle a callable module
 class Swizzle(types.ModuleType):
     def __init__(self):
         types.ModuleType.__init__(self, __name__)
         self.__dict__.update(sys.modules[__name__].__dict__)
     
-    def __call__(self, cls=None, meta=False):
-        return swizzle(cls, meta)
+    def __call__(self, cls=None, meta=False, sep = None):
+        return swizzle(cls, meta, sep)
 
 sys.modules[__name__] = Swizzle()
         

{swizzle-0.1.0.dist-info → swizzle-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: swizzle
-Version: 0.1.0
+Version: 0.1.2
 Summary: Transforms a string representation of a Python literal into the corresponding Python object.
 Home-page: https://github.com/janthmueller/swizzle
 Author: Jan T. Müller
@@ -35,6 +35,11 @@ print(Vector(1, 2, 3).yzx)  # Output: (2, 3, 1)
 ```
 
 ## Installation
+### From PyPI
+```bash
+pip install swizzle
+```
+### From GitHub
 ```bash
 pip install git+https://github.com/janthmueller/swizzle.git
 ```
@@ -72,7 +77,7 @@ class XYZ(IntEnum):
     Z = 3
 
 # Test the swizzle
-print(XYZ.yxz)  # Output: (2, 3, 1)
+print(XYZ.yxz)  # Output: (<XYZ.Y: 2>, <XYZ.X: 1>, <XYZ.Z: 3>)
 ```
 Setting the `meta` argument to `True` in the swizzle decorator extends the `getattr` behavior of the metaclass, enabling attribute swizzling directly on the class itself.
 
@@ -110,8 +115,8 @@ class Test:
     xyz = 7
 
 # Test the swizzle
-print(Test.xz)  # Output: (6,)
-print(Test.yz)  # Output: (5,)
+print(Test.xz)  # Output: 6
+print(Test.yz)  # Output: 5
 print(Test.xyyz)  # Output: (4, 5)
 print(Test.xyzx)  # Output: (7, 1)
 ```

swizzle-0.1.2.dist-info/RECORD

@@ -0,0 +1,5 @@
+swizzle/__init__.py,sha256=xWLQSOHFJ3eK_I5tnY5LLybU6IbsPocwz-3LmEunDVw,2684
+swizzle-0.1.2.dist-info/METADATA,sha256=fkh4lJnUzFmgHWaZWp5q5JRNHO7puyjPxvAjS578Fkk,2890
+swizzle-0.1.2.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+swizzle-0.1.2.dist-info/top_level.txt,sha256=XFSQti81x2zM0zAMCY1YD0lqB1eSg5my9BB03uFgCic,8
+swizzle-0.1.2.dist-info/RECORD,,

swizzle-0.1.0.dist-info/RECORD

@@ -1,5 +0,0 @@
-swizzle/__init__.py,sha256=6xrT6tZERBQWGNPvWofOiSnVGzq-0-nRWbAjt9-czJY,2281
-swizzle-0.1.0.dist-info/METADATA,sha256=f4MejVS5TgwsY0hroO6wR7gWIJjLl1Guzx4K_zhm8j4,2807
-swizzle-0.1.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-swizzle-0.1.0.dist-info/top_level.txt,sha256=XFSQti81x2zM0zAMCY1YD0lqB1eSg5my9BB03uFgCic,8
-swizzle-0.1.0.dist-info/RECORD,,