istr-python 1.0.9__tar.gz → 1.0.11__tar.gz

{istr_python-1.0.9 → istr_python-1.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: istr-python
-Version: 1.0.9
+Version: 1.0.11
 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
@@ -343,14 +343,29 @@ a, b, c = istr(5, 6, 7) ==> a=istr('5') , b=istr('6'), c=istr('7')
 ```
 
 #### test for even/odd
-It is possible to test for even/odd (provided the istr can be interpreted as an int) with the
-
-`is_even` and `is_odd` method, e.g.
+It is possible to test for even/odd (provided the istr can be interpreted as an int) with the `is_even` and `is_odd` method, e.g.
 
 ```
 istr(4).is_even()) ==> True
 istr(5).is_odd()) ==> 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.
+
+```
+istr(4).is_square() ==> True
+istr(5).is_square()) ==> 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.
+
+```
+istr(4).is_prime() ==> False
+istr(5).is_prime()) ==> True
+```
 
 #### test for divisibility
 
@@ -365,7 +380,7 @@ It is possible to test whether an istr is divisible by a given value with the `i
 
 #### 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 appearts more than once).
+With the `all_distinct` method, it is possible to test whether all characters are distinct (i.e. no character appears more than once).
 
 ```
 istr('01234').all_distict() ==> True

{istr_python-1.0.9 → istr_python-1.0.11}/README.md

@@ -330,14 +330,29 @@ a, b, c = istr(5, 6, 7) ==> a=istr('5') , b=istr('6'), c=istr('7')
 ```
 
 #### test for even/odd
-It is possible to test for even/odd (provided the istr can be interpreted as an int) with the
-
-`is_even` and `is_odd` method, e.g.
+It is possible to test for even/odd (provided the istr can be interpreted as an int) with the `is_even` and `is_odd` method, e.g.
 
 ```
 istr(4).is_even()) ==> True
 istr(5).is_odd()) ==> 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.
+
+```
+istr(4).is_square() ==> True
+istr(5).is_square()) ==> 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.
+
+```
+istr(4).is_prime() ==> False
+istr(5).is_prime()) ==> True
+```
 
 #### test for divisibility
 
@@ -352,7 +367,7 @@ It is possible to test whether an istr is divisible by a given value with the `i
 
 #### 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 appearts more than once).
+With the `all_distinct` method, it is possible to test whether all characters are distinct (i.e. no character appears more than once).
 
 ```
 istr('01234').all_distict() ==> True

{istr_python-1.0.9 → istr_python-1.0.11}/istr/istr.py

@@ -5,10 +5,9 @@
 #    |_||___/ \__||_|
 # strings you can count on
 
-__version__ = "1.0.9"
+__version__ = "1.0.11"
 import functools
 import math
-import copy
 import itertools
 
 """
@@ -345,14 +344,33 @@ class istr(str):
 
     def is_even(self):
         if not self.is_int():
-            raise TypeError(f"unsupported operand for is_even: {self._frepr(self)}")
+            raise TypeError(f"not interpretable as int: {self._frepr(self)}")
         return self._as_int % 2 == 0
 
     def is_odd(self):
         if not self.is_int():
-            raise TypeError(f"unsupported operand for is_odd: {self._frepr(self)}")
+            raise TypeError(f"not interpretable as int: {self._frepr(self)}")
         return self._as_int % 2 == 1
 
+    def is_square(self):
+        if not self.is_int():
+            raise TypeError(f"not interpretable as int: {self._frepr(self)}")
+        return self._as_int >= 0 and self == math.isqrt(self._as_int) ** 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:
+            return False
+        if self._as_int == 2:
+            return True
+        if not self._as_int & 1:
+            return False
+        for x in range(3, int(self._as_int**0.5) + 1, 2):
+            if self._as_int % x == 0:
+                return False
+        return True
+
     def __or__(self, other):
         try:
             return self.__class__(str(self).__add__(other))
@@ -385,9 +403,9 @@ class istr(str):
 
     def reversed(self):
         return self[::-1]
-        
+
     def is_divisible_by(self, divisor):
-        return self._as_int % int(divisor)  == 0
+        return self._as_int % int(divisor) == 0
 
     def _str_method(self, name, *args, **kwargs):
         return self.__class__(getattr(super(), name)(*args, **kwargs))
@@ -436,8 +454,7 @@ 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
@@ -456,8 +473,7 @@ 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
@@ -476,8 +492,7 @@ 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
@@ -557,12 +572,8 @@ class istr(str):
 
 
 def main():
-    print(istr(18).is_divisible_by(3))
-    print(istr(18).is_divisible_by(istr(3)))
-    print(istr(19).is_divisible_by(3))
-    print(istr(19).is_divisible_by(istr(3)))
-    print(istr.digits(1,9))
-    
+    ...
+
+
 if __name__ == "__main__":
     main()
-

{istr_python-1.0.9 → istr_python-1.0.11}/istr_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: istr-python
-Version: 1.0.9
+Version: 1.0.11
 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
@@ -343,14 +343,29 @@ a, b, c = istr(5, 6, 7) ==> a=istr('5') , b=istr('6'), c=istr('7')
 ```
 
 #### test for even/odd
-It is possible to test for even/odd (provided the istr can be interpreted as an int) with the
-
-`is_even` and `is_odd` method, e.g.
+It is possible to test for even/odd (provided the istr can be interpreted as an int) with the `is_even` and `is_odd` method, e.g.
 
 ```
 istr(4).is_even()) ==> True
 istr(5).is_odd()) ==> 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.
+
+```
+istr(4).is_square() ==> True
+istr(5).is_square()) ==> 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.
+
+```
+istr(4).is_prime() ==> False
+istr(5).is_prime()) ==> True
+```
 
 #### test for divisibility
 
@@ -365,7 +380,7 @@ It is possible to test whether an istr is divisible by a given value with the `i
 
 #### 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 appearts more than once).
+With the `all_distinct` method, it is possible to test whether all characters are distinct (i.e. no character appears more than once).
 
 ```
 istr('01234').all_distict() ==> True

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

{istr_python-1.0.9 → istr_python-1.0.11}/tests/test_istr.py

@@ -304,7 +304,34 @@ def test_even_odd():
     assert not istr(1).is_even()
 
     assert istr(12345678).is_even()
-    assert not istr(12345678).is_odd()
+    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()
+
+
+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()
+
+
+def test_is_prime():
+    assert not istr(0).is_prime()
+    assert not istr(1).is_prime()
+    assert istr(2).is_prime()
+    assert istr(3).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()
 
 
 def test_join():
@@ -555,12 +582,14 @@ 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))
-    
+
+
 def test_digits():
     assert istr.digits().equals(istr("0123456789"))
     assert istr.digits("").equals(istr("0123456789"))
@@ -628,8 +657,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'))"
@@ -637,4 +665,3 @@ def test_subclassing():
 
 if __name__ == "__main__":
     pytest.main(["-vv", "-s", "-x", __file__])
-