Merge pull request #6 from ken-morel/dev

Fix overriding self error in comberloaders call when using with pyoload

README.md

@@ -83,8 +83,8 @@ def first():
     pass
 
 @first.fail
-def second(e):
-    pass
+def second():
+    print(first.error)
 ```
 
 ## failback
@@ -101,7 +101,7 @@ def first():
     pass
 
 @first.failback
-def second(e=None):  # e will be passed if module fails to load
+def second():
     pass
 ```
 # callbacks

src/comberload.py

@@ -1,4 +1,3 @@
-import functools
 import sys
 
 from functools import wraps
@@ -32,7 +31,7 @@ def fallback_get_input():
 
     """
 
-    __version__ = "1.1.1"
+    __version__ = "1.1.2"
     worker_running = False
     should_work = True
     backlog = []
@@ -68,14 +67,14 @@ def __init__(self, modules: list[str], func: Callable):
                 self.comberloaded = False
             wraps(func)(self)
 
-        def call(self, *args, **kw):
+        def call(__comberloaded_special__self, *args, **kw):
             """
             The default call for comberloaded instance, calla the
             fallback if given, else returns None
             """
-            if self._fallback is None:
+            if __comberloaded_special__self._fallback is None:
                 return None
-            return self._fallback(*args, **kw)
+            return __comberloaded_special__self._fallback(*args, **kw)
 
         def fallback(self, func: Callable):
             """
@@ -204,7 +203,8 @@ def _worker(self):
                         if len(set(self.failed) & set(loader.modules)) > 0:
                             loader.comberloaded = False
                             loader.failed = True
-                            loader.call = functools.partial(loader._fail, e)
+                            loader.call = loader._fail
+                            loader.error = e
                 else:
                     if module in self.backlog:
                         self.backlog.remove(module)

src/tests/test_comberload.py

@@ -1,7 +1,7 @@
 def test_comberload():
     import comberload
 
-    assert comberload.__version__ == "1.1.1"
+    assert comberload.__version__ == "1.1.2"
 
     @comberload("sys")
     def foo():