istr-python 1.1.34__tar.gz → 1.1.35__tar.gz

{istr_python-1.1.34 → istr_python-1.1.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: istr-python
-Version: 1.1.34
+Version: 1.1.35
 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
@@ -435,19 +435,19 @@ It is also possible to test for divisibility of an ordinary int:
 istr.is_divisible(18, 3) ==> True
 istr.is_divisible(19, 3) ==> False
 ```
-The method `divided_by` not only tests divisibility, but also returns the result of the division. If not possible, `istr('')` will be returned, unless the *fallback* (last argument) is given, in which case *fallback* will be returned.
+The method `divided_by` not only tests divisibility, but also returns the result of the division. If not possible, `istr('0')` will be returned, unless the *fallback* (last argument) is given, in which case *fallback* will be returned.
 
 The result will be always istr-ed, except for None.
 ```
 istr(18).divided_by(3) ==> 6 (actually istr("6"))
 istr(18).divided_by(istr(3)) ==> 6
-istr(19).divided_by(3) ==> istr('')
-istr(19).divided_by(3, 0) ==> istr('0')
-istr(19).divided_by(3) ==> istr('')
-istr(19).divided_by(istr(3)) ==> istr('')
+istr(19).divided_by(3) ==> istr('0')
+istr(19).divided_by(3, 1) ==> istr('1')
+istr(19).divided_by(3) ==> istr('0')
+istr(19).divided_by(istr(3)) ==> istr('0')
 istr.divided_by(18, 3) ==>  6
-istr.divided_by(19, 3) ==>  istr('')
-istr.divided_by(19, 3, 0) ==>  istr('0')
+istr.divided_by(19, 3) ==>  istr('0')
+istr.divided_by(19, 3, 1) ==>  istr('1')
 ```
 #### test for square
 
@@ -490,6 +490,14 @@ istr.is_power_of(81, 4) ==> True
 istr.is_power_of(82, 4) ==> False
 ```
 
+If called without an exponent, the test will be for any perfect power:
+
+```
+istr(2**10).is_power_of() ==> True
+istr(-3**3).is_power_of() ==> True
+istr(34).is_power_of() ==> 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.
@@ -504,6 +512,20 @@ It is also possible to test for prime of an ordinary int:
 istr.is_prime(4) ==> False
 istr.is_prime(5) ==> True
 ```
+#### get divisors of a number
+The method `divisors` will generate all divisors of a number.
+Normally, the divisors are sorted, but if the sorted flag is False, the order is not necessarily maintained (this is slightly more efficient).
+```
+istr(18).divisors() ==> [istr('1'), istr('2'), istr('3'), istr('6'), istr('9'), istr('18')]
+istr(19).divisors() ==> [istr('1'), istr('19')]  
+istr(18).divisors(sorted=False) ==> [istr('1'), istr('18'), istr('2'), istr('9'), istr('3'), istr('6')]  
+```
+This method can also be used with an int. E.g.:  
+```
+istr.divisors(18) ==> [istr('1'), istr('2'), istr('3'), istr('6'), istr('9'), istr('18')]
+istr.divisors(19) ==> [istr('1'), istr('19')]  
+istr.divisors(18, False) ==> [istr('1'), istr('18'), istr('2'), istr('9'), istr('3'), istr('6')]  
+```
 
 #### test whether all characters are distinct
 
@@ -790,7 +812,7 @@ Examples:
 ```
 istr(1234).getitem(2) ==> 2
 istr(1234).getitem(-2) ==> 3
-istr(1234).getitem(5) ==> istr('2')
+istr(1234).getitem(5) ==> istr('')
 istr(1234).getitem(5, '0') ==> istr('0')
 istr(1234).getitem(5, None) ==> None
 ```
@@ -798,7 +820,7 @@ This method can also be used with an str. E.g.:
 ```
 istr.getitem('1234', 2) ==> 2
 istr.getitem('1234', -2) ==> 3
-istr.getitem('1234', 5) ==> istr('2')
+istr.getitem('1234', 5) ==> istr('')
 istr.getitem('1234',5, '0') ==> istr('0')
 istr.getitem('1234',5, None) ==> None
 ```

{istr_python-1.1.34 → istr_python-1.1.35}/README.md

@@ -422,19 +422,19 @@ It is also possible to test for divisibility of an ordinary int:
 istr.is_divisible(18, 3) ==> True
 istr.is_divisible(19, 3) ==> False
 ```
-The method `divided_by` not only tests divisibility, but also returns the result of the division. If not possible, `istr('')` will be returned, unless the *fallback* (last argument) is given, in which case *fallback* will be returned.
+The method `divided_by` not only tests divisibility, but also returns the result of the division. If not possible, `istr('0')` will be returned, unless the *fallback* (last argument) is given, in which case *fallback* will be returned.
 
 The result will be always istr-ed, except for None.
 ```
 istr(18).divided_by(3) ==> 6 (actually istr("6"))
 istr(18).divided_by(istr(3)) ==> 6
-istr(19).divided_by(3) ==> istr('')
-istr(19).divided_by(3, 0) ==> istr('0')
-istr(19).divided_by(3) ==> istr('')
-istr(19).divided_by(istr(3)) ==> istr('')
+istr(19).divided_by(3) ==> istr('0')
+istr(19).divided_by(3, 1) ==> istr('1')
+istr(19).divided_by(3) ==> istr('0')
+istr(19).divided_by(istr(3)) ==> istr('0')
 istr.divided_by(18, 3) ==>  6
-istr.divided_by(19, 3) ==>  istr('')
-istr.divided_by(19, 3, 0) ==>  istr('0')
+istr.divided_by(19, 3) ==>  istr('0')
+istr.divided_by(19, 3, 1) ==>  istr('1')
 ```
 #### test for square
 
@@ -477,6 +477,14 @@ istr.is_power_of(81, 4) ==> True
 istr.is_power_of(82, 4) ==> False
 ```
 
+If called without an exponent, the test will be for any perfect power:
+
+```
+istr(2**10).is_power_of() ==> True
+istr(-3**3).is_power_of() ==> True
+istr(34).is_power_of() ==> 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.
@@ -491,6 +499,20 @@ It is also possible to test for prime of an ordinary int:
 istr.is_prime(4) ==> False
 istr.is_prime(5) ==> True
 ```
+#### get divisors of a number
+The method `divisors` will generate all divisors of a number.
+Normally, the divisors are sorted, but if the sorted flag is False, the order is not necessarily maintained (this is slightly more efficient).
+```
+istr(18).divisors() ==> [istr('1'), istr('2'), istr('3'), istr('6'), istr('9'), istr('18')]
+istr(19).divisors() ==> [istr('1'), istr('19')]  
+istr(18).divisors(sorted=False) ==> [istr('1'), istr('18'), istr('2'), istr('9'), istr('3'), istr('6')]  
+```
+This method can also be used with an int. E.g.:  
+```
+istr.divisors(18) ==> [istr('1'), istr('2'), istr('3'), istr('6'), istr('9'), istr('18')]
+istr.divisors(19) ==> [istr('1'), istr('19')]  
+istr.divisors(18, False) ==> [istr('1'), istr('18'), istr('2'), istr('9'), istr('3'), istr('6')]  
+```
 
 #### test whether all characters are distinct
 
@@ -777,7 +799,7 @@ Examples:
 ```
 istr(1234).getitem(2) ==> 2
 istr(1234).getitem(-2) ==> 3
-istr(1234).getitem(5) ==> istr('2')
+istr(1234).getitem(5) ==> istr('')
 istr(1234).getitem(5, '0') ==> istr('0')
 istr(1234).getitem(5, None) ==> None
 ```
@@ -785,7 +807,7 @@ This method can also be used with an str. E.g.:
 ```
 istr.getitem('1234', 2) ==> 2
 istr.getitem('1234', -2) ==> 3
-istr.getitem('1234', 5) ==> istr('2')
+istr.getitem('1234', 5) ==> istr('')
 istr.getitem('1234',5, '0') ==> istr('0')
 istr.getitem('1234',5, None) ==> None
 ```

{istr_python-1.1.34 → istr_python-1.1.35}/istr/istr.py

@@ -5,7 +5,7 @@
 #    |_||___/ \__||_|
 # strings you can count on
 
-__version__ = "1.1.34"
+__version__ = "1.1.35"
 import functools
 import itertools
 import types
@@ -424,9 +424,9 @@ class istr(str):
         return all(i0 > i1 for i0, i1 in zip(self_as_str, self_as_str[1:]))
 
     def is_divisible_by(self, divisor):
-        return istr.divided_by(self, divisor) != ""
+        return istr.divided_by(self, divisor, None) is not None
 
-    def divided_by(self, divisor, fallback=""):
+    def divided_by(self, divisor, fallback="0"):
         if fallback is not None:
             fallback = istr(fallback)
         if divisor == 0:
@@ -443,6 +443,23 @@ class istr(str):
             else:
                 return istr(fallback)
 
+    def divisors(self, sorted=True):
+        n = istr.interpret_as_int(self)
+        if n<=0:
+            raise ValueError(f'must be >=0, not {n}')
+        tail = []
+        for d in range(1, math.isqrt(n) + 1):
+            q, r = divmod(n, d)
+            if r == 0:
+                yield istr(d)
+                if q != d:
+                    if sorted:
+                        tail.append(istr(q))
+                    else:
+                        yield istr(q)
+        if sorted:
+            yield from reversed(tail)
+
     def is_prime(self):
         n = istr.interpret_as_int(self)
         if n < 1_000_000:
@@ -501,8 +518,10 @@ class istr(str):
     def is_cube(self):
         return istr.is_power_of(self, 3)
 
-    def is_power_of(self, exponent):
+    def is_power_of(self, exponent=None):
         n = istr.interpret_as_int(self)
+        if exponent is None:
+            return (n == 1) or any(istr(n).is_power_of(exponent) for exponent in range(2, int(math.log2(abs(n)) + 1)))
         exponent = check_integer(exponent, "exponent")
         if n < 0:
             if exponent % 2 == 0:
@@ -848,7 +867,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
@@ -869,7 +889,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
@@ -888,7 +909,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
@@ -1101,3 +1123,4 @@ class istrModule(types.ModuleType):
 
 if __name__ != "__main__":
     sys.modules["istr"].__class__ = istrModule
+

{istr_python-1.1.34 → istr_python-1.1.35}/istr_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: istr-python
-Version: 1.1.34
+Version: 1.1.35
 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
@@ -435,19 +435,19 @@ It is also possible to test for divisibility of an ordinary int:
 istr.is_divisible(18, 3) ==> True
 istr.is_divisible(19, 3) ==> False
 ```
-The method `divided_by` not only tests divisibility, but also returns the result of the division. If not possible, `istr('')` will be returned, unless the *fallback* (last argument) is given, in which case *fallback* will be returned.
+The method `divided_by` not only tests divisibility, but also returns the result of the division. If not possible, `istr('0')` will be returned, unless the *fallback* (last argument) is given, in which case *fallback* will be returned.
 
 The result will be always istr-ed, except for None.
 ```
 istr(18).divided_by(3) ==> 6 (actually istr("6"))
 istr(18).divided_by(istr(3)) ==> 6
-istr(19).divided_by(3) ==> istr('')
-istr(19).divided_by(3, 0) ==> istr('0')
-istr(19).divided_by(3) ==> istr('')
-istr(19).divided_by(istr(3)) ==> istr('')
+istr(19).divided_by(3) ==> istr('0')
+istr(19).divided_by(3, 1) ==> istr('1')
+istr(19).divided_by(3) ==> istr('0')
+istr(19).divided_by(istr(3)) ==> istr('0')
 istr.divided_by(18, 3) ==>  6
-istr.divided_by(19, 3) ==>  istr('')
-istr.divided_by(19, 3, 0) ==>  istr('0')
+istr.divided_by(19, 3) ==>  istr('0')
+istr.divided_by(19, 3, 1) ==>  istr('1')
 ```
 #### test for square
 
@@ -490,6 +490,14 @@ istr.is_power_of(81, 4) ==> True
 istr.is_power_of(82, 4) ==> False
 ```
 
+If called without an exponent, the test will be for any perfect power:
+
+```
+istr(2**10).is_power_of() ==> True
+istr(-3**3).is_power_of() ==> True
+istr(34).is_power_of() ==> 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.
@@ -504,6 +512,20 @@ It is also possible to test for prime of an ordinary int:
 istr.is_prime(4) ==> False
 istr.is_prime(5) ==> True
 ```
+#### get divisors of a number
+The method `divisors` will generate all divisors of a number.
+Normally, the divisors are sorted, but if the sorted flag is False, the order is not necessarily maintained (this is slightly more efficient).
+```
+istr(18).divisors() ==> [istr('1'), istr('2'), istr('3'), istr('6'), istr('9'), istr('18')]
+istr(19).divisors() ==> [istr('1'), istr('19')]  
+istr(18).divisors(sorted=False) ==> [istr('1'), istr('18'), istr('2'), istr('9'), istr('3'), istr('6')]  
+```
+This method can also be used with an int. E.g.:  
+```
+istr.divisors(18) ==> [istr('1'), istr('2'), istr('3'), istr('6'), istr('9'), istr('18')]
+istr.divisors(19) ==> [istr('1'), istr('19')]  
+istr.divisors(18, False) ==> [istr('1'), istr('18'), istr('2'), istr('9'), istr('3'), istr('6')]  
+```
 
 #### test whether all characters are distinct
 
@@ -790,7 +812,7 @@ Examples:
 ```
 istr(1234).getitem(2) ==> 2
 istr(1234).getitem(-2) ==> 3
-istr(1234).getitem(5) ==> istr('2')
+istr(1234).getitem(5) ==> istr('')
 istr(1234).getitem(5, '0') ==> istr('0')
 istr(1234).getitem(5, None) ==> None
 ```
@@ -798,7 +820,7 @@ This method can also be used with an str. E.g.:
 ```
 istr.getitem('1234', 2) ==> 2
 istr.getitem('1234', -2) ==> 3
-istr.getitem('1234', 5) ==> istr('2')
+istr.getitem('1234', 5) ==> istr('')
 istr.getitem('1234',5, '0') ==> istr('0')
 istr.getitem('1234',5, None) ==> None
 ```

{istr_python-1.1.34 → istr_python-1.1.35}/pyproject.toml

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

{istr_python-1.1.34 → istr_python-1.1.35}/tests/test_istr.py

@@ -424,18 +424,18 @@ def test_is_divisible_by():
 def test_divided_by():
     assert istr(18).divided_by(3).equals(istr(6))
     assert istr(18).divided_by(istr(3)).equals(istr(6))
-    assert istr(19).divided_by(3).equals(istr(""))
-    assert istr(19).divided_by(istr(3)).equals(istr(""))
+    assert istr(19).divided_by(3).equals(istr("0"))
+    assert istr(19).divided_by(istr(3)).equals(istr("0"))
     with pytest.raises(TypeError, match=re.escape(f"not interpretable as int")):
         istr("a").divided_by(3)
     assert istr.divided_by(18, 3).equals(istr(6))
-    assert istr.divided_by(19, 3).equals(istr(""))
-    assert istr.divided_by(18, 3, 0).equals(istr(6))
-    assert istr.divided_by(19, 3, 0).equals(istr("0"))
+    assert istr.divided_by(19, 3).equals(istr("0"))
+    assert istr.divided_by(18, 3, 1).equals(istr(6))
+    assert istr.divided_by(19, 3, 1).equals(istr("1"))
     assert istr.divided_by(18, 3, None).equals(istr(6))
     assert istr.divided_by(19, 3, None) is None
-    assert istr.divided_by(4, 0).equals(istr(""))
-    assert istr.divided_by(4, 0, 0).equals(istr("0"))
+    assert istr.divided_by(4, 0).equals(istr("0"))
+    assert istr.divided_by(4, 0, 1).equals(istr("1"))
 
 
 def test_is_square():
@@ -506,7 +506,12 @@ def test_is_power_of():
     assert istr(10).is_power_of(1)
     assert istr(-8).is_power_of(3)
 
-
+def test_is_power_of_no_arg():
+    assert istr(2**10).is_power_of()
+    assert not istr(2**10+1).is_power_of()    
+    assert istr(1).is_power_of()    
+    assert istr((-5)**3).is_power_of()    
+    
 def test_is_prime():
     assert not istr(0).is_prime()
     assert not istr(1).is_prime()
@@ -577,7 +582,19 @@ def test_power_ofs():
     assert id(istr.power_ofs(3, 2000)) != id(istr.cubes(3, 2000))  # test caching
     assert id(istr.power_ofs(3, 1000, cache=False)) != id(istr.cubes(3, 1000, cache=False))  # test caching
 
-
+def test_divisors():
+    assert list(istr(36).divisors())==istr([1,2,3,4,6,9,12,18,36])
+    assert list(istr(36).divisors(sorted=False))==istr([1,36,2,18,3,12,4,9,6])    
+    assert list(istr(37).divisors())==istr([1,37])
+    assert list(istr(1).divisors())==istr([1])    
+    with pytest.raises(ValueError,match=re.escape("must be >=0, not 0")):
+        list(istr(0).divisors())
+    with pytest.raises(ValueError,match=re.escape("must be >=0, not -1")):
+        list(istr(-1).divisors())
+    assert list(istr.divisors(36))==istr([1,2,3,4,6,9,12,18,36])
+    assert list(istr.divisors(36,False))==istr([1,36,2,18,3,12,4,9,6])    
+    assert list(istr.divisors(37))==istr([1,37])                
+        
 def test_in_range():
     primes1000 = istr.primes(1000)
     n = len(primes1000)
@@ -1014,7 +1031,8 @@ def test_sumprod():
 
 
 def test_subclassing():
-    class jstr(istr.type): ...
+    class jstr(istr.type):
+        ...
 
     assert jstr(5).equals(jstr(5))
     assert repr(jstr(*range(3))) == "(jstr('0'), jstr('1'), jstr('2'))"
@@ -1139,3 +1157,4 @@ def test_compose():
 
 if __name__ == "__main__":
     pytest.main(["-vv", "-s", "-x", __file__])
+