istr-python 1.1.5__tar.gz → 1.1.6__tar.gz

{istr_python-1.1.5 → istr_python-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: istr-python
-Version: 1.1.5
+Version: 1.1.6
 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
@@ -372,7 +372,7 @@ It is also possible to test for square of an ordinary int:
 ```
 istr.is_square(4) ==> True
 istr.is_square(5) ==> False
-
+```
 #### test for cube
 
 It is possible to test whether the value is a perfect cube (provided the istr can be interpreted as an int) with the `is_cube` method, e.g.
@@ -385,6 +385,7 @@ It is also possible to test for cube of an ordinary int:
 ```
 istr.is_cube(27) ==> True
 istr.is_cube(28 ==> False
+```
 
 #### test for power of
 
@@ -398,6 +399,7 @@ It is also possible to test for power of of an ordinary int:
 ```
 istr.is_power_of(81, 4) ==> True
 istr.is_power_of(82, 4) ==> False
+```
 
 #### test for prime
 
@@ -784,25 +786,25 @@ operator/function   int  str   Example
 +                    x         istr(20) + 3 ==> istr('23')
 _                    x         istr(20) - 3 ==> istr('17')
 *                    x         istr(20) * 3 ==> istr('60')
-/                    x         istr(20) / 3 ==> istr('6')
-//                   x         istr(20) // 3 ==> istr('6')
-%                    x         istr(20) % 3 ==> istr('2')
-divmod               x         divmod(istr(20), 3) ==> (istr('6'), istr('2'))
-**                   x         istr(2) ** 3 ==> istr('8')
-<=, <, >, >=         x         istr('100') > istr('2') ==> True
-abs                  x         abs(istr(-20)) ==> istr('20')
-==                   x    x    istr(20) == 20 ==> True | istr(20) == '20' ==> True
-bool                 x    x *) bool(istr(' 0 ')) ==> False | istr('') ==> False
-@                         x    istr(20) @ 3 ==> istr('202020')
-|                         x    istr(20) | '5' ==> istr('205')
-slicing                   x    istr(12345)[1:3] ==> istr('23')
-iterate                   x    [x for x in istr(20)] ==> [istr('2'), istr('0')]
-len                       x    len(istr(' 20 ')) ==> 4
-count                     x    istr(100).count('0') ==> 2
-index                     x    istr(' 100 ').index('0') ==> 2
-split                     x    istr('1 2').split() ==> (istr('1'), istr('2'))
-string format             x    f"|{istr(1234):6}|" ==> '|1234  |'
-other string methods      x    istr('aAbBcC').lower() ==> istr('aabbcc')
+                     /                    x         istr(20) / 3 ==> istr('6')
+                     //                   x         istr(20) // 3 ==> istr('6')
+                     %                    x         istr(20) % 3 ==> istr('2')
+                     divmod               x         divmod(istr(20), 3) ==> (istr('6'), istr('2'))
+                     **                   x         istr(2) ** 3 ==> istr('8')
+                     <=, <, >, >=         x         istr('100') > istr('2') ==> True
+                     abs                  x         abs(istr(-20)) ==> istr('20')
+                     ==                   x    x    istr(20) == 20 ==> True | istr(20) == '20' ==> True
+                     bool                 x    x *) bool(istr(' 0 ')) ==> False | istr('') ==> False
+                     @                         x    istr(20) @ 3 ==> istr('202020')
+                     |                         x    istr(20) | '5' ==> istr('205')
+                     slicing                   x    istr(12345)[1:3] ==> istr('23')
+                     iterate                   x    [x for x in istr(20)] ==> [istr('2'), istr('0')]
+                     len                       x    len(istr(' 20 ')) ==> 4
+                     count                     x    istr(100).count('0') ==> 2
+                     index                     x    istr(' 100 ').index('0') ==> 2
+                     split                     x    istr('1 2').split() ==> (istr('1'), istr('2'))
+                     string format             x    f"|{istr(1234):6}|" ==> '|1234  |'
+                     other string methods      x    istr('aAbBcC').lower() ==> istr('aabbcc')
                                istr('aAbBcC').islower() ==> False
                                istr('  abc   ').strip() ==> istr('abc')
                                ...

{istr_python-1.1.5 → istr_python-1.1.6}/README.md

@@ -359,7 +359,7 @@ It is also possible to test for square of an ordinary int:
 ```
 istr.is_square(4) ==> True
 istr.is_square(5) ==> False
-
+```
 #### test for cube
 
 It is possible to test whether the value is a perfect cube (provided the istr can be interpreted as an int) with the `is_cube` method, e.g.
@@ -372,6 +372,7 @@ It is also possible to test for cube of an ordinary int:
 ```
 istr.is_cube(27) ==> True
 istr.is_cube(28 ==> False
+```
 
 #### test for power of
 
@@ -385,6 +386,7 @@ It is also possible to test for power of of an ordinary int:
 ```
 istr.is_power_of(81, 4) ==> True
 istr.is_power_of(82, 4) ==> False
+```
 
 #### test for prime
 
@@ -771,25 +773,25 @@ operator/function   int  str   Example
 +                    x         istr(20) + 3 ==> istr('23')
 _                    x         istr(20) - 3 ==> istr('17')
 *                    x         istr(20) * 3 ==> istr('60')
-/                    x         istr(20) / 3 ==> istr('6')
-//                   x         istr(20) // 3 ==> istr('6')
-%                    x         istr(20) % 3 ==> istr('2')
-divmod               x         divmod(istr(20), 3) ==> (istr('6'), istr('2'))
-**                   x         istr(2) ** 3 ==> istr('8')
-<=, <, >, >=         x         istr('100') > istr('2') ==> True
-abs                  x         abs(istr(-20)) ==> istr('20')
-==                   x    x    istr(20) == 20 ==> True | istr(20) == '20' ==> True
-bool                 x    x *) bool(istr(' 0 ')) ==> False | istr('') ==> False
-@                         x    istr(20) @ 3 ==> istr('202020')
-|                         x    istr(20) | '5' ==> istr('205')
-slicing                   x    istr(12345)[1:3] ==> istr('23')
-iterate                   x    [x for x in istr(20)] ==> [istr('2'), istr('0')]
-len                       x    len(istr(' 20 ')) ==> 4
-count                     x    istr(100).count('0') ==> 2
-index                     x    istr(' 100 ').index('0') ==> 2
-split                     x    istr('1 2').split() ==> (istr('1'), istr('2'))
-string format             x    f"|{istr(1234):6}|" ==> '|1234  |'
-other string methods      x    istr('aAbBcC').lower() ==> istr('aabbcc')
+                     /                    x         istr(20) / 3 ==> istr('6')
+                     //                   x         istr(20) // 3 ==> istr('6')
+                     %                    x         istr(20) % 3 ==> istr('2')
+                     divmod               x         divmod(istr(20), 3) ==> (istr('6'), istr('2'))
+                     **                   x         istr(2) ** 3 ==> istr('8')
+                     <=, <, >, >=         x         istr('100') > istr('2') ==> True
+                     abs                  x         abs(istr(-20)) ==> istr('20')
+                     ==                   x    x    istr(20) == 20 ==> True | istr(20) == '20' ==> True
+                     bool                 x    x *) bool(istr(' 0 ')) ==> False | istr('') ==> False
+                     @                         x    istr(20) @ 3 ==> istr('202020')
+                     |                         x    istr(20) | '5' ==> istr('205')
+                     slicing                   x    istr(12345)[1:3] ==> istr('23')
+                     iterate                   x    [x for x in istr(20)] ==> [istr('2'), istr('0')]
+                     len                       x    len(istr(' 20 ')) ==> 4
+                     count                     x    istr(100).count('0') ==> 2
+                     index                     x    istr(' 100 ').index('0') ==> 2
+                     split                     x    istr('1 2').split() ==> (istr('1'), istr('2'))
+                     string format             x    f"|{istr(1234):6}|" ==> '|1234  |'
+                     other string methods      x    istr('aAbBcC').lower() ==> istr('aabbcc')
                                istr('aAbBcC').islower() ==> False
                                istr('  abc   ').strip() ==> istr('abc')
                                ...

{istr_python-1.1.5 → istr_python-1.1.6}/istr/istr.py

@@ -5,7 +5,7 @@
 #    |_||___/ \__||_|
 # strings you can count on
 
-__version__ = "1.1.5"
+__version__ = "1.1.6"
 import functools
 import itertools
 import types
@@ -15,7 +15,7 @@ import inspect
 """
 Note: the changelog is now in changelog.md
 
-You can view the changelog on www.salabim.org/istr/changelog.html
+You can view the changelog on www.salabim.org/istr/changelog
 
 The readme can be viewed on www.salabim.org/istr/
 """
@@ -202,7 +202,8 @@ class istr(str):
         it is possible to give more than one parameter, in which case a tuple
         of the istrs of the parameters will be returned, which can be handy
         to multiple assign, e.g.
-            a, b, c = istr(5, 6, 7) ==> a=istr('5') , b=istr('6'), c=istr('7')"""
+            a, b, c = istr(5, 6, 7) ==> a=istr('5') , b=istr('6'), c=istr('7')
+    """
 
     __slots__ = ("_as_int", "_as_repr")
 
@@ -345,57 +346,30 @@ class istr(str):
         return int(self._as_int)
 
     def is_even(self):
-        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
+        return istr.is_divisible_by(self,2)
 
     def is_odd(self):
-        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 not istr.is_divisible_by(self,2)
 
-        return n % 2 == 1
+    def is_divisible_by(self, divisor):
+        return istr.interpret_as_int(self) % int(divisor) == 0
 
     def is_square(self):
-        return istr._is_power_of(self, 2)
+        return istr.is_power_of(self, 2)
 
     def is_cube(self):
-        return istr._is_power_of(self, 3)
+        return istr.is_power_of(self, 3)
 
     def is_power_of(self, exponent):
-        return istr._is_power_of(self, exponent)
-
-    @staticmethod
-    def _is_power_of(self, exponent):
-        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)
+        n = istr.interpret_as_int(self)
         if exponent < 1:
             raise ValueError(f"exponent must be >=1; not {exponent}")
         if not isinstance(exponent, int):
             raise TypeError(f"exponent must be int; not {type(exponent)}")
-
         return n >= 0 and self == round(n ** (1 / exponent)) ** exponent
 
     def is_prime(self):
-        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)
-
+        n = istr.interpret_as_int(self)
         if n < 2:
             return False
         if n == 2:
@@ -429,6 +403,19 @@ class istr(str):
             raise ValueError(f"incorrect number of variables {len(letters)}; should be {len(self)}")
         namespace.update(lookup)
 
+    @classmethod
+    def compose(cls, letters, namespace=None):
+        """
+        compose an istr from individual letter variables
+        """
+        if namespace is None:
+            namespace = inspect.currentframe().f_back.f_globals
+        for letter in letters:
+            if letter not in namespace:
+                raise ValueError(f"variable {letter} not defined")
+
+        return istr("").join(istr(namespace[letter]) for letter in letters)
+
     def __or__(self, other):
         try:
             return self.__class__(str(self).__add__(other))
@@ -462,14 +449,14 @@ class istr(str):
     def reversed(self):
         return self[::-1]
 
-    def is_divisible_by(self, divisor):
+    def interpret_as_int(self):
         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
+        return n
 
     def _str_method(self, name, *args, **kwargs):
         return self.__class__(getattr(super(), name)(*args, **kwargs))
@@ -575,7 +562,7 @@ class istr(str):
         if no args, 0-9 will be used
 
         all given args will be used
-        each arg has to be either null string, <digit>, <digit>-<digit> or -<digit>
+        each arg has to be either null string, <digit>, <digit>-<digit>, <digit>- or -<digit>
 
         the digits may be '0' through '9' and 'A' through 'Z' (not case sensitive)
         The returned value will always be in uppercase (if applicable).
@@ -636,19 +623,6 @@ class istr(str):
         cls._digits_cache[key] = result
         return result
 
-    @classmethod
-    def compose(cls, letters, namespace=None):
-        """
-        compose an istr from individual letter variables
-        """
-        if namespace is None:
-            namespace = inspect.currentframe().f_back.f_globals
-        for letter in letters:
-            if letter not in namespace:
-                raise ValueError(f"variable {letter} not defined")
-
-        return istr("").join(istr(namespace[letter]) for letter in letters)
-
 
 istr.type = type(istr(0))
 

{istr_python-1.1.5 → istr_python-1.1.6}/istr_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: istr-python
-Version: 1.1.5
+Version: 1.1.6
 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
@@ -372,7 +372,7 @@ It is also possible to test for square of an ordinary int:
 ```
 istr.is_square(4) ==> True
 istr.is_square(5) ==> False
-
+```
 #### test for cube
 
 It is possible to test whether the value is a perfect cube (provided the istr can be interpreted as an int) with the `is_cube` method, e.g.
@@ -385,6 +385,7 @@ It is also possible to test for cube of an ordinary int:
 ```
 istr.is_cube(27) ==> True
 istr.is_cube(28 ==> False
+```
 
 #### test for power of
 
@@ -398,6 +399,7 @@ It is also possible to test for power of of an ordinary int:
 ```
 istr.is_power_of(81, 4) ==> True
 istr.is_power_of(82, 4) ==> False
+```
 
 #### test for prime
 
@@ -784,25 +786,25 @@ operator/function   int  str   Example
 +                    x         istr(20) + 3 ==> istr('23')
 _                    x         istr(20) - 3 ==> istr('17')
 *                    x         istr(20) * 3 ==> istr('60')
-/                    x         istr(20) / 3 ==> istr('6')
-//                   x         istr(20) // 3 ==> istr('6')
-%                    x         istr(20) % 3 ==> istr('2')
-divmod               x         divmod(istr(20), 3) ==> (istr('6'), istr('2'))
-**                   x         istr(2) ** 3 ==> istr('8')
-<=, <, >, >=         x         istr('100') > istr('2') ==> True
-abs                  x         abs(istr(-20)) ==> istr('20')
-==                   x    x    istr(20) == 20 ==> True | istr(20) == '20' ==> True
-bool                 x    x *) bool(istr(' 0 ')) ==> False | istr('') ==> False
-@                         x    istr(20) @ 3 ==> istr('202020')
-|                         x    istr(20) | '5' ==> istr('205')
-slicing                   x    istr(12345)[1:3] ==> istr('23')
-iterate                   x    [x for x in istr(20)] ==> [istr('2'), istr('0')]
-len                       x    len(istr(' 20 ')) ==> 4
-count                     x    istr(100).count('0') ==> 2
-index                     x    istr(' 100 ').index('0') ==> 2
-split                     x    istr('1 2').split() ==> (istr('1'), istr('2'))
-string format             x    f"|{istr(1234):6}|" ==> '|1234  |'
-other string methods      x    istr('aAbBcC').lower() ==> istr('aabbcc')
+                     /                    x         istr(20) / 3 ==> istr('6')
+                     //                   x         istr(20) // 3 ==> istr('6')
+                     %                    x         istr(20) % 3 ==> istr('2')
+                     divmod               x         divmod(istr(20), 3) ==> (istr('6'), istr('2'))
+                     **                   x         istr(2) ** 3 ==> istr('8')
+                     <=, <, >, >=         x         istr('100') > istr('2') ==> True
+                     abs                  x         abs(istr(-20)) ==> istr('20')
+                     ==                   x    x    istr(20) == 20 ==> True | istr(20) == '20' ==> True
+                     bool                 x    x *) bool(istr(' 0 ')) ==> False | istr('') ==> False
+                     @                         x    istr(20) @ 3 ==> istr('202020')
+                     |                         x    istr(20) | '5' ==> istr('205')
+                     slicing                   x    istr(12345)[1:3] ==> istr('23')
+                     iterate                   x    [x for x in istr(20)] ==> [istr('2'), istr('0')]
+                     len                       x    len(istr(' 20 ')) ==> 4
+                     count                     x    istr(100).count('0') ==> 2
+                     index                     x    istr(' 100 ').index('0') ==> 2
+                     split                     x    istr('1 2').split() ==> (istr('1'), istr('2'))
+                     string format             x    f"|{istr(1234):6}|" ==> '|1234  |'
+                     other string methods      x    istr('aAbBcC').lower() ==> istr('aabbcc')
                                istr('aAbBcC').islower() ==> False
                                istr('  abc   ').strip() ==> istr('abc')
                                ...

{istr_python-1.1.5 → istr_python-1.1.6}/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.5"
+version = "1.1.6"
 readme = "README.md"
 requires-python = ">=3.7"
 dependencies = []