istr-python 1.0.10__tar.gz → 1.0.12__tar.gz

{istr_python-1.0.10 → istr_python-1.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: istr-python
-Version: 1.0.10
+Version: 1.0.12
 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
@@ -349,6 +349,11 @@ It is possible to test for even/odd (provided the istr can be interpreted as an
 istr(4).is_even()) ==> True
 istr(5).is_odd()) ==> True
 ```
+It is also possible to test for even/odd of an ordinary int:
+```
+istr.is_even(4) ==> True
+istr.is_odd(5) ==> True
+```
 #### test for square
 
 It is possible to test whether the value is a perfect  square (provided the istr can be interpreted as an int) with the `is_square` method, e.g.
@@ -357,7 +362,11 @@ It is possible to test whether the value is a perfect  square (provided the istr
 istr(4).is_square() ==> True
 istr(5).is_square()) ==> False
 ```
-
+It is also possible to test for square of an ordinary int:
+```
+istr.is_square(4) ==> True
+istr.is_square(5) ==> False
+```
 #### test for prime
 
 It is possible to test whether the value is a prime number (provided the istr can be interpreted as an int) with the `is_prime` method, e.g.
@@ -366,18 +375,27 @@ It is possible to test whether the value is a prime number (provided the istr ca
 istr(4).is_prime() ==> False
 istr(5).is_prime()) ==> True
 ```
+It is also possible to test for prime of an ordinary int:
 
+```
+istr.is_prime(4) ==> False
+istr.is_prime(5) ==> True
+```
 #### test for divisibility
 
 It is possible to test whether an istr is divisible by a given value with the `is_divisible_by method,` e.g.
 
 ```
-    istr(18).is_divisible_by(3) ==> True
-    istr(18).is_divisible_by(istr(3)) ==> True
-    istr(19).is_divisible_by(3) ==> False
-    istr(19).is_divisible_by(istr(3)) == False
+istr(18).is_divisible_by(3) ==> True
+istr(18).is_divisible_by(istr(3)) ==> True
+istr(19).is_divisible_by(3) ==> False
+istr(19).is_divisible_by(istr(3)) == False
+```
+It is also possible to test for divisibility of an ordinary int:
+```
+istr.is_divisible(18, 3) ==> True
+istr.is_divisible(19, 3) ==> False
 ```
-
 #### test whether all characters are distinct
 
 With the `all_distinct` method, it is possible to test whether all characters are distinct (i.e. no character appears more than once).

{istr_python-1.0.10 → istr_python-1.0.12}/README.md

@@ -336,6 +336,11 @@ It is possible to test for even/odd (provided the istr can be interpreted as an
 istr(4).is_even()) ==> True
 istr(5).is_odd()) ==> True
 ```
+It is also possible to test for even/odd of an ordinary int:
+```
+istr.is_even(4) ==> True
+istr.is_odd(5) ==> True
+```
 #### test for square
 
 It is possible to test whether the value is a perfect  square (provided the istr can be interpreted as an int) with the `is_square` method, e.g.
@@ -344,7 +349,11 @@ It is possible to test whether the value is a perfect  square (provided the istr
 istr(4).is_square() ==> True
 istr(5).is_square()) ==> False
 ```
-
+It is also possible to test for square of an ordinary int:
+```
+istr.is_square(4) ==> True
+istr.is_square(5) ==> False
+```
 #### test for prime
 
 It is possible to test whether the value is a prime number (provided the istr can be interpreted as an int) with the `is_prime` method, e.g.
@@ -353,18 +362,27 @@ It is possible to test whether the value is a prime number (provided the istr ca
 istr(4).is_prime() ==> False
 istr(5).is_prime()) ==> True
 ```
+It is also possible to test for prime of an ordinary int:
 
+```
+istr.is_prime(4) ==> False
+istr.is_prime(5) ==> True
+```
 #### test for divisibility
 
 It is possible to test whether an istr is divisible by a given value with the `is_divisible_by method,` e.g.
 
 ```
-    istr(18).is_divisible_by(3) ==> True
-    istr(18).is_divisible_by(istr(3)) ==> True
-    istr(19).is_divisible_by(3) ==> False
-    istr(19).is_divisible_by(istr(3)) == False
+istr(18).is_divisible_by(3) ==> True
+istr(18).is_divisible_by(istr(3)) ==> True
+istr(19).is_divisible_by(3) ==> False
+istr(19).is_divisible_by(istr(3)) == False
+```
+It is also possible to test for divisibility of an ordinary int:
+```
+istr.is_divisible(18, 3) ==> True
+istr.is_divisible(19, 3) ==> False
 ```
-
 #### test whether all characters are distinct
 
 With the `all_distinct` method, it is possible to test whether all characters are distinct (i.e. no character appears more than once).

{istr_python-1.0.10 → istr_python-1.0.12}/istr/istr.py

@@ -5,7 +5,7 @@
 #    |_||___/ \__||_|
 # strings you can count on
 
-__version__ = "1.0.10"
+__version__ = "1.0.12"
 import functools
 import math
 import itertools
@@ -243,9 +243,9 @@ class istr(str):
             return value
         if isinstance(value, dict):
             return type(value)((k, cls(v)) for k, v in value.items())
-        if not isinstance(value, (str, type)) and hasattr(value, "__iter__"):      
+        if not isinstance(value, (str, type)) and hasattr(value, "__iter__"):
             if hasattr(value, "__next__"):
-                return map(functools.partial(cls), value)              
+                return map(functools.partial(cls), value)
             return type(value)(map(functools.partial(cls), value))
         as_int = cls._to_int(value)
         if isinstance(value, str):
@@ -343,36 +343,55 @@ class istr(str):
         return int(self._as_int)
 
     def is_even(self):
-        if not self.is_int():
-            raise TypeError(f"not interpretable as int: {self._frepr(self)}")
-        return self._as_int % 2 == 0
+        if isinstance(self, istr):
+            if not self.is_int():
+                raise TypeError(f"not interpretable as int: {self._frepr(self)}")
+            n = self._as_int
+        else:
+            n = int(self)
+
+        return n % 2 == 0
 
     def is_odd(self):
-        if not self.is_int():
-            raise TypeError(f"not interpretable as int: {self._frepr(self)}")
-        return self._as_int % 2 == 1
+        if isinstance(self, istr):
+            if not self.is_int():
+                raise TypeError(f"not interpretable as int: {self._frepr(self)}")
+            n = self._as_int
+        else:
+            n = int(self)
+
+        return n % 2 == 1
 
     def is_square(self):
-        if not self.is_int():
-            raise TypeError(f"not interpretable as int: {self._frepr(self)}")
-        return self == math.isqrt(self._as_int)**2
+        if isinstance(self, istr):
+            if not self.is_int():
+                raise TypeError(f"not interpretable as int: {self._frepr(self)}")
+            n = self._as_int
+        else:
+            n = int(self)
+
+        return n >= 0 and self == math.isqrt(n) ** 2
 
     def is_prime(self):
-        if not self.is_int():
-            raise TypeError(f"not interpretable as int: {self._frepr(self)}")
-        if self._as_int < 2:
+        if isinstance(self, istr):
+            if not self.is_int():
+                raise TypeError(f"not interpretable as int: {self._frepr(self)}")
+            n = self._as_int
+        else:
+            n = int(self)
+
+        if n < 2:
             return False
-        if self._as_int == 2:
+        if n == 2:
             return True
-        if not self._as_int & 1:
+        if not n & 1:
             return False
-        for x in range(3, int(self._as_int**0.5) + 1, 2):
-            if self._as_int % x == 0:
+
+        for x in range(3, int(n**0.5) + 1, 2):
+            if n % x == 0:
                 return False
         return True
 
-
-
     def __or__(self, other):
         try:
             return self.__class__(str(self).__add__(other))
@@ -407,7 +426,13 @@ class istr(str):
         return self[::-1]
 
     def is_divisible_by(self, divisor):
-        return self._as_int % int(divisor) == 0
+        if isinstance(self, istr):
+            if not self.is_int():
+                raise TypeError(f"not interpretable as int: {self._frepr(self)}")
+            n = self._as_int
+        else:
+            n = int(self)
+        return n % int(divisor) == 0
 
     def _str_method(self, name, *args, **kwargs):
         return self.__class__(getattr(super(), name)(*args, **kwargs))
@@ -574,8 +599,9 @@ class istr(str):
 
 
 def main():
-    for i in range(100):
-        print(i, istr(i).is_prime(),istr(i).is_square())
+    print(istr(2).is_even())
+    print(istr.is_even("2"))
+    print(istr(3).is_prime())
 
 
 if __name__ == "__main__":

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: istr-python
-Version: 1.0.10
+Version: 1.0.12
 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
@@ -349,6 +349,11 @@ It is possible to test for even/odd (provided the istr can be interpreted as an
 istr(4).is_even()) ==> True
 istr(5).is_odd()) ==> True
 ```
+It is also possible to test for even/odd of an ordinary int:
+```
+istr.is_even(4) ==> True
+istr.is_odd(5) ==> True
+```
 #### test for square
 
 It is possible to test whether the value is a perfect  square (provided the istr can be interpreted as an int) with the `is_square` method, e.g.
@@ -357,7 +362,11 @@ It is possible to test whether the value is a perfect  square (provided the istr
 istr(4).is_square() ==> True
 istr(5).is_square()) ==> False
 ```
-
+It is also possible to test for square of an ordinary int:
+```
+istr.is_square(4) ==> True
+istr.is_square(5) ==> False
+```
 #### test for prime
 
 It is possible to test whether the value is a prime number (provided the istr can be interpreted as an int) with the `is_prime` method, e.g.
@@ -366,18 +375,27 @@ It is possible to test whether the value is a prime number (provided the istr ca
 istr(4).is_prime() ==> False
 istr(5).is_prime()) ==> True
 ```
+It is also possible to test for prime of an ordinary int:
 
+```
+istr.is_prime(4) ==> False
+istr.is_prime(5) ==> True
+```
 #### test for divisibility
 
 It is possible to test whether an istr is divisible by a given value with the `is_divisible_by method,` e.g.
 
 ```
-    istr(18).is_divisible_by(3) ==> True
-    istr(18).is_divisible_by(istr(3)) ==> True
-    istr(19).is_divisible_by(3) ==> False
-    istr(19).is_divisible_by(istr(3)) == False
+istr(18).is_divisible_by(3) ==> True
+istr(18).is_divisible_by(istr(3)) ==> True
+istr(19).is_divisible_by(3) ==> False
+istr(19).is_divisible_by(istr(3)) == False
+```
+It is also possible to test for divisibility of an ordinary int:
+```
+istr.is_divisible(18, 3) ==> True
+istr.is_divisible(19, 3) ==> False
 ```
-
 #### test whether all characters are distinct
 
 With the `all_distinct` method, it is possible to test whether all characters are distinct (i.e. no character appears more than once).

{istr_python-1.0.10 → istr_python-1.0.12}/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.10"
+version = "1.0.12"
 readme = "README.md"
 requires-python = ">=3.7"
 dependencies = [

{istr_python-1.0.10 → istr_python-1.0.12}/tests/test_istr.py

@@ -7,9 +7,10 @@ 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 / "..").resolve()
+    top_folder = (file_folder / ".." / "istr").resolve()
     sys.path.insert(0, str(top_folder))
     os.chdir(file_folder)
+    print(f"{file_folder=} {top_folder=}")
 
 import pytest
 
@@ -304,13 +305,33 @@ def test_even_odd():
     assert not istr(1).is_even()
 
     assert istr(12345678).is_even()
-    
+    with pytest.raises(TypeError, match=re.escape(f"not interpretable as int")):
+        istr("a").is_odd()
+    with pytest.raises(TypeError, match=re.escape(f"not interpretable as int")):
+        istr("a").is_even()
+
+    assert istr.is_odd(1)
+    assert not istr.is_even(1)
+    assert istr.is_even(12345678)
+    assert istr.is_odd(11111111)
+
+
 def test_is_square():
+    assert not istr(-1).is_square()
+    assert istr(0).is_square()
     assert istr(1).is_square()
     assert not istr(2).is_square()
     assert istr(4).is_square()
     assert istr(16).is_square()
     assert not istr(99).is_square()
+    with pytest.raises(TypeError, match=re.escape(f"not interpretable as int")):
+        istr("a").is_square()
+    assert istr.is_square(0)
+    assert istr.is_square(1)
+    assert not istr.is_square(2)
+    assert istr.is_square(4)
+    assert istr.is_square(16)
+
 
 def test_is_prime():
     assert not istr(0).is_prime()
@@ -320,10 +341,15 @@ def test_is_prime():
     assert not istr(4).is_prime()
     assert istr(97).is_prime()
     assert not istr(99).is_prime()
-
-
-
-
+    with pytest.raises(TypeError, match=re.escape(f"not interpretable as int")):
+        istr("a").is_prime()
+    assert not istr.is_prime(0)
+    assert not istr.is_prime(1)
+    assert istr.is_prime(2)
+    assert istr.is_prime(3)
+    assert not istr.is_prime(4)
+    assert istr.is_prime(97)
+    assert not istr.is_prime(99)
 
 
 def test_join():
@@ -574,12 +600,18 @@ def test_base():
     with istr.base(10):
         assert a * a == 225
 
-def test_is_divisible():    
+
+def test_is_divisible():
     assert istr(18).is_divisible_by(3)
     assert istr(18).is_divisible_by(istr(3))
     assert not istr(19).is_divisible_by(3)
     assert not istr(19).is_divisible_by(istr(3))
-    
+    with pytest.raises(TypeError, match=re.escape(f"not interpretable as int")):
+        istr("a").is_divisible_by(3)
+    assert istr.is_divisible_by(18, 3)
+    assert not istr.is_divisible_by(19, 3)
+
+
 def test_digits():
     assert istr.digits().equals(istr("0123456789"))
     assert istr.digits("").equals(istr("0123456789"))
@@ -647,8 +679,7 @@ def test_all_distinct():
 
 
 def test_subclassing():
-    class jstr(istr):
-        ...
+    class jstr(istr): ...
 
     assert jstr(5).equals(jstr(5))
     assert repr(jstr(*range(3))) == "(jstr('0'), jstr('1'), jstr('2'))"
@@ -656,4 +687,3 @@ def test_subclassing():
 
 if __name__ == "__main__":
     pytest.main(["-vv", "-s", "-x", __file__])
-