istr-python 1.1.26__tar.gz → 1.1.27__tar.gz

{istr_python-1.1.26 → istr_python-1.1.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: istr-python
-Version: 1.1.26
+Version: 1.1.27
 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
@@ -611,6 +611,18 @@ results in
 (istr('2'), istr('1'), istr('0'))
 ```
 
+Note that the count method is also used like `istr(100).find(0)` , using the count method of strings. The context defines which version is used:
+
+```
+istr(100).count(0) ==> 2
+istr(100).count(0, 1) ==>2
+istr(100).count("a") ==> 0
+
+istr.count() ==> istr('0'), istr('1'), istr('2'), ...
+istr.count(10) ==> istr('10'), istr('11'), istr('12'), ...
+istr.count(10,3) ==> istr('10'), istr('13'), istr('16'), ...
+```
+
 #### concatenate an iterable
 
 The `istr.concat` method can be useful to map all items of an iterable
@@ -938,14 +950,14 @@ _                    x         istr(20) - 3 ==> istr('17')
                      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
+                     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('aAbBcC').islower() ==> False
+                                                    istr('  abc   ').strip() ==> istr('abc')
+                                                    ...
 -----------------------------------------------------------------------------------------
 *) str is applied if is_int() is False
 ```

{istr_python-1.1.26 → istr_python-1.1.27}/README.md

@@ -598,6 +598,18 @@ results in
 (istr('2'), istr('1'), istr('0'))
 ```
 
+Note that the count method is also used like `istr(100).find(0)` , using the count method of strings. The context defines which version is used:
+
+```
+istr(100).count(0) ==> 2
+istr(100).count(0, 1) ==>2
+istr(100).count("a") ==> 0
+
+istr.count() ==> istr('0'), istr('1'), istr('2'), ...
+istr.count(10) ==> istr('10'), istr('11'), istr('12'), ...
+istr.count(10,3) ==> istr('10'), istr('13'), istr('16'), ...
+```
+
 #### concatenate an iterable
 
 The `istr.concat` method can be useful to map all items of an iterable
@@ -925,14 +937,14 @@ _                    x         istr(20) - 3 ==> istr('17')
                      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
+                     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('aAbBcC').islower() ==> False
+                                                    istr('  abc   ').strip() ==> istr('abc')
+                                                    ...
 -----------------------------------------------------------------------------------------
 *) str is applied if is_int() is False
 ```

{istr_python-1.1.26 → istr_python-1.1.27}/istr/istr.py

@@ -5,7 +5,7 @@
 #    |_||___/ \__||_|
 # strings you can count on
 
-__version__ = "1.1.26"
+__version__ = "1.1.27"
 import functools
 import itertools
 import types
@@ -402,9 +402,10 @@ class istr(str):
 
     def is_odd(self):
         return not istr.is_divisible_by(self, 2)
-        
+
     def is_palindrome(self):
-        return str(self)==str(self)[::-1]
+        self_as_str = str(self)
+        return self_as_str == self_as_str[::-1]
 
     def is_divisible_by(self, divisor):
         return istr.divided_by(self, divisor) is not None
@@ -679,12 +680,18 @@ class istr(str):
         return cls(getattr(itertools, name)(*args, **kwargs))
 
     for name in dir(itertools):
-        if not name.startswith("__"):
+        if not name.startswith("__") and not name == "count":  # count has its own method
             if name in ("groupby", "tee"):
                 locals()[name] = getattr(itertools, name)
             else:
                 locals()[name] = functools.partialmethod(_itertools_method, name)
 
+    def count(*args):
+        if len(args) >= 2 and isinstance(args[0], istr):
+            return str(args[0]).count(str(args[1]), *map(int, args[2:]))
+        else:
+            return istr(itertools.count(*args))
+
     def is_int(self):
         return self._as_int is not self._nan
 

{istr_python-1.1.26 → istr_python-1.1.27}/istr_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: istr-python
-Version: 1.1.26
+Version: 1.1.27
 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
@@ -611,6 +611,18 @@ results in
 (istr('2'), istr('1'), istr('0'))
 ```
 
+Note that the count method is also used like `istr(100).find(0)` , using the count method of strings. The context defines which version is used:
+
+```
+istr(100).count(0) ==> 2
+istr(100).count(0, 1) ==>2
+istr(100).count("a") ==> 0
+
+istr.count() ==> istr('0'), istr('1'), istr('2'), ...
+istr.count(10) ==> istr('10'), istr('11'), istr('12'), ...
+istr.count(10,3) ==> istr('10'), istr('13'), istr('16'), ...
+```
+
 #### concatenate an iterable
 
 The `istr.concat` method can be useful to map all items of an iterable
@@ -938,14 +950,14 @@ _                    x         istr(20) - 3 ==> istr('17')
                      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
+                     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('aAbBcC').islower() ==> False
+                                                    istr('  abc   ').strip() ==> istr('abc')
+                                                    ...
 -----------------------------------------------------------------------------------------
 *) str is applied if is_int() is False
 ```

{istr_python-1.1.26 → istr_python-1.1.27}/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.26"
+version = "1.1.27"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = []

{istr_python-1.1.26 → istr_python-1.1.27}/tests/test_istr.py

@@ -254,14 +254,26 @@ def test_index():
         one_to_twelve.index("13")
 
 
-def test_count():
-    assert one_to_twelve.count(2) == 1
-    assert one_to_twelve.count(two) == 1
-    assert one_to_twelve.count("2") == 1
-    assert one_to_twelve.count(13) == 0
-    assert one_to_twelve.count(thirteen) == 0
-    assert one_to_twelve.count("13") == 0
-
+def test_str_count():
+    assert istr("100").count("0") == 2
+    assert istr("100").count("0",0) ==2
+    assert istr("100").count("0",1)==2
+    assert istr("100").count("0",2)==1
+    assert istr("100").count("0",0,1)==0
+    assert istr("100").count(0)==2
+    assert istr("100").count(10)==1
+    assert istr("100").count(100)==1
+    assert istr("1000").count(100)==1
+    assert isinstance(istr("100").count(),map)  # this is in fact the itertools version
+
+
+def test_itertools_count():
+    assert list(itertools.islice(istr.count(),3))==[istr('0'), istr('1'), istr('2')]
+    assert list(istr.islice(istr.count(10),3)) ==[istr('10'), istr('11'), istr('12')]
+    assert list(istr.islice(istr.count(istr(10)),3)) ==[istr('10'), istr('11'), istr('12')]
+    assert list(istr.islice(istr.count(10,3),3))==[istr('10'), istr('13'), istr('16')]
+
+    assert istr.count(istr(10),1)==1  # this is in fact the istr version
 
 def test_hash():
     assert hash(istr.range(1, 13)) == hash(one_to_twelve)