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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: istr-python
-Version: 1.0.10
+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

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

@@ -5,7 +5,7 @@
 #    |_||___/ \__||_|
 # strings you can count on
 
-__version__ = "1.0.10"
+__version__ = "1.0.11"
 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):
@@ -355,7 +355,7 @@ class istr(str):
     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
+        return self._as_int >= 0 and self == math.isqrt(self._as_int) ** 2
 
     def is_prime(self):
         if not self.is_int():
@@ -371,8 +371,6 @@ class istr(str):
                 return False
         return True
 
-
-
     def __or__(self, other):
         try:
             return self.__class__(str(self).__add__(other))
@@ -574,8 +572,7 @@ class istr(str):
 
 
 def main():
-    for i in range(100):
-        print(i, istr(i).is_prime(),istr(i).is_square())
+    ...
 
 
 if __name__ == "__main__":

{istr_python-1.0.10 → 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.10
+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

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

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

@@ -304,13 +304,23 @@ 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()
+
+
 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()
@@ -320,10 +330,8 @@ 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()
 
 
 def test_join():
@@ -574,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"))
@@ -647,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'))"
@@ -656,4 +665,3 @@ def test_subclassing():
 
 if __name__ == "__main__":
     pytest.main(["-vv", "-s", "-x", __file__])
-