istr-python 1.0.12.post0__tar.gz → 1.1.0__tar.gz

{istr_python-1.0.12.post0 → istr_python-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: istr-python
-Version: 1.0.12.post0
+Version: 1.1.0
 Summary: istr - strings you can count on
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/istr
@@ -29,7 +29,7 @@ M O N E Y
 can be nicely, albeit not very efficient, coded as:
 ```
 import itertools
-from istr import istr
+import istr
 
 for s, e, n, d, m, o, r, y in istr(itertools.permutations(range(10), 8)):
     if m and ((s|e|n|d) + (m|o|r|e) == (m|o|n|e|y)):
@@ -66,7 +66,7 @@ No dependencies!
 Just start with
 
 ```
-from istr import istr
+import istr
 ```
 
 #### Use istr as int
@@ -558,7 +558,7 @@ When a class is derived from istr, all methods will return that newly derived cl
 
 E.g.
 ```
-class jstr(istr):
+class jstr(istr.type):
     ...
     
 print(repr(jstr(4) * jstr(5)))

{istr_python-1.0.12.post0 → istr_python-1.1.0}/README.md

@@ -16,7 +16,7 @@ M O N E Y
 can be nicely, albeit not very efficient, coded as:
 ```
 import itertools
-from istr import istr
+import istr
 
 for s, e, n, d, m, o, r, y in istr(itertools.permutations(range(10), 8)):
     if m and ((s|e|n|d) + (m|o|r|e) == (m|o|n|e|y)):
@@ -53,7 +53,7 @@ No dependencies!
 Just start with
 
 ```
-from istr import istr
+import istr
 ```
 
 #### Use istr as int
@@ -545,7 +545,7 @@ When a class is derived from istr, all methods will return that newly derived cl
 
 E.g.
 ```
-class jstr(istr):
+class jstr(istr.type):
     ...
     
 print(repr(jstr(4) * jstr(5)))

{istr_python-1.0.12.post0 → istr_python-1.1.0}/istr/istr.py

@@ -5,17 +5,19 @@
 #    |_||___/ \__||_|
 # strings you can count on
 
-__version__ = "1.0.12"
+__version__ = "1.1.0"
 import functools
 import math
 import itertools
+import types
+import sys
 
 """
 Note: the changelog is now in changelog.md
 
 You can view the changelog on www.salabim.org/istr/changelog.html
 
-The readme can be viewed on www.salabim.org/istr/readme.html
+The readme can be viewed on www.salabim.org/istr/
 """
 
 _0_to_Z = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -346,9 +348,9 @@ class istr(str):
         if isinstance(self, istr):
             if not self.is_int():
                 raise TypeError(f"not interpretable as int: {self._frepr(self)}")
-            n=self._as_int
+            n = self._as_int
         else:
-            n=int(self)
+            n = int(self)
 
         return n % 2 == 0
 
@@ -356,9 +358,9 @@ class istr(str):
         if isinstance(self, istr):
             if not self.is_int():
                 raise TypeError(f"not interpretable as int: {self._frepr(self)}")
-            n=self._as_int
+            n = self._as_int
         else:
-            n=int(self)
+            n = int(self)
 
         return n % 2 == 1
 
@@ -366,9 +368,9 @@ class istr(str):
         if isinstance(self, istr):
             if not self.is_int():
                 raise TypeError(f"not interpretable as int: {self._frepr(self)}")
-            n=self._as_int
+            n = self._as_int
         else:
-            n=int(self)
+            n = int(self)
 
         return n >= 0 and self == math.isqrt(n) ** 2
 
@@ -376,9 +378,9 @@ class istr(str):
         if isinstance(self, istr):
             if not self.is_int():
                 raise TypeError(f"not interpretable as int: {self._frepr(self)}")
-            n=self._as_int
+            n = self._as_int
         else:
-            n=int(self)
+            n = int(self)
 
         if n < 2:
             return False
@@ -386,7 +388,7 @@ class istr(str):
             return True
         if not n & 1:
             return False
-         
+
         for x in range(3, int(n**0.5) + 1, 2):
             if n % x == 0:
                 return False
@@ -429,9 +431,9 @@ class istr(str):
         if isinstance(self, istr):
             if not self.is_int():
                 raise TypeError(f"not interpretable as int: {self._frepr(self)}")
-            n=self._as_int
+            n = self._as_int
         else:
-            n=int(self)
+            n = int(self)
         return n % int(divisor) == 0
 
     def _str_method(self, name, *args, **kwargs):
@@ -481,7 +483,8 @@ class istr(str):
 
             cls._int_format = int_format
 
-        def __enter__(self): ...
+        def __enter__(self):
+            ...
 
         def __exit__(self, exc_type, exc_value, exc_tb):
             self.saved_cls._int_format = self.saved_int_format
@@ -500,7 +503,8 @@ class istr(str):
             self.saved_cls = cls
             cls._repr_mode = mode
 
-        def __enter__(self): ...
+        def __enter__(self):
+            ...
 
         def __exit__(self, exc_type, exc_value, exc_tb):
             self.saved_cls._repr_mode = self.saved_repr_mode
@@ -519,7 +523,8 @@ class istr(str):
             self.saved_cls = cls
             cls._base = base
 
-        def __enter__(self): ...
+        def __enter__(self):
+            ...
 
         def __exit__(self, exc_type, exc_value, exc_tb):
             self.saved_cls._base = self.saved_base
@@ -596,82 +601,23 @@ class istr(str):
         result = istr("".join(result))
         cls._digits_cache[key] = result
         return result
-
-def runner(range):
-    # this function is only for AnacondaCode !!! 
-
-    import importlib.abc
-    import sys
-    import types
-    import re
-
-
-    def load_module(module_name, source):
-        """
-        load a module from memory
-        based on:
-        https://stackoverflow.com/questions/65009309/dynamically-import-module-from-memory-in-python-3-using-hooks
-        """
-
-        class StringLoader(importlib.abc.Loader):
-            def __init__(self, modules):
-                self._modules = modules
-
-            def has_module(self, fullname):
-                return fullname in self._modules
-
-            def create_module(self, spec):
-                if self.has_module(spec.name):
-                    module = types.ModuleType(spec.name)
-                    exec(self._modules[spec.name], module.__dict__)
-                    return module
-
-            def exec_module(self, module):
-                pass
-
-        class StringFinder(importlib.abc.MetaPathFinder):
-            def __init__(self, loader):
-                self._loader = loader
-
-            def find_spec(self, fullname, path, target=None):
-                if self._loader.has_module(fullname):
-                    return importlib.machinery.ModuleSpec(fullname, self._loader)
-
-        if module_name in sys.modules:  # remove from modules
-            del sys.modules[module_name]
-
-        for obj in sys.meta_path[:]:  # remove from sys.meta_path
-            try:
-                if obj._loader.has_module(module_name):
-                    sys.meta_path.remove(obj)
-            except:
-                ...
-
-        sys.meta_path.append(StringFinder(StringLoader({module_name: source})))
-
-
-    regex = re.compile(r"(?i)#\s*module\s*=\s*(\w+)")
-
-    for column in zip(*range):
-        module_name = None
-        for line in column:
-            if line is not None:
-                if (match_object := re.match(regex, line)) is not None:
-                    module_name = match_object.group(1)
-                    break
-
-        source = "\n".join("" if line is None else str(line) for line in column)
-        if module_name:
-            load_module(module_name, source)
-        else:
-            exec(source, globals())
-
-    return globals().get("output")
+        
+istr.type=type(istr(0))
 
 
 def main():
     ...
 
+class istrModule(types.ModuleType):
+    def __call__(self, *args, **kwargs):
+        return istr.__call__(*args, **kwargs)
+    def __setattr__(self, item, value):
+        setattr(istr,item,value)
+    def __getattr__(self, item,):
+        return getattr(istr,item)
+
+sys.modules[__name__].__class__ = istrModule
 
 if __name__ == "__main__":
     main()
+

{istr_python-1.0.12.post0 → istr_python-1.1.0}/istr_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: istr-python
-Version: 1.0.12.post0
+Version: 1.1.0
 Summary: istr - strings you can count on
 Author-email: Ruud van der Ham <rt.van.der.ham@gmail.com>
 Project-URL: Homepage, https://github.com/salabim/istr
@@ -29,7 +29,7 @@ M O N E Y
 can be nicely, albeit not very efficient, coded as:
 ```
 import itertools
-from istr import istr
+import istr
 
 for s, e, n, d, m, o, r, y in istr(itertools.permutations(range(10), 8)):
     if m and ((s|e|n|d) + (m|o|r|e) == (m|o|n|e|y)):
@@ -66,7 +66,7 @@ No dependencies!
 Just start with
 
 ```
-from istr import istr
+import istr
 ```
 
 #### Use istr as int
@@ -558,7 +558,7 @@ When a class is derived from istr, all methods will return that newly derived cl
 
 E.g.
 ```
-class jstr(istr):
+class jstr(istr.type):
     ...
     
 print(repr(jstr(4) * jstr(5)))

{istr_python-1.0.12.post0 → istr_python-1.1.0}/pyproject.toml

@@ -8,7 +8,7 @@ authors = [
     {name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com"}
 ]
 description = "istr - strings you can count on"
-version = "1.0.12-0"
+version = "1.1.0"
 readme = "README.md"
 requires-python = ">=3.7"
 dependencies = [

{istr_python-1.0.12.post0 → istr_python-1.1.0}/tests/test_istr.py

@@ -6,15 +6,13 @@ import re
 from pathlib import Path
 
 if __name__ == "__main__":  # to make the tests run without the pytest cli
-    file_folder = Path(__file__).parent
-    top_folder = (file_folder / ".." / "istr").resolve()
-    sys.path.insert(0, str(top_folder))
+    file_folder = os.path.dirname(__file__)
     os.chdir(file_folder)
-    print(f"{file_folder=} {top_folder=}")
-
+    sys.path.insert(0, file_folder + "/../istr") 
+       
 import pytest
 
-from istr import istr
+import istr
 
 istr.equals = lambda self, other: type(self) == type(other) and (str(self) == str(other))
 # this method tests whether self and other are exactly the same
@@ -360,17 +358,17 @@ def test_join():
     s = istr("").join(("4", "5", "6"))
     assert s == "456"
     assert s == 456
-    assert type(s) == istr
+    assert type(s) == istr.type
 
     s = istr("").join(istr(("4", "5", "6")))
     assert s == "456"
     assert s == 456
-    assert type(s) == istr
+    assert type(s) == istr.type
 
     s = istr("").join(istr(("", "", "6")))
     assert s == "6"
     assert s == 6
-    assert type(s) == istr
+    assert type(s) == istr.type
 
 
 def test_or():
@@ -679,7 +677,7 @@ def test_all_distinct():
 
 
 def test_subclassing():
-    class jstr(istr): ...
+    class jstr(istr.type): ...
 
     assert jstr(5).equals(jstr(5))
     assert repr(jstr(*range(3))) == "(jstr('0'), jstr('1'), jstr('2'))"