istr-python 0.1.1__tar.gz → 0.1.2__tar.gz

{istr_python-0.1.1 → istr_python-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: istr-python
-Version: 0.1.1
+Version: 0.1.2
 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-0.1.1 → istr_python-0.1.2}/istr/istr.py

@@ -8,16 +8,21 @@ import math
 #    |_||___/ \__||_|
 # strings you can count on
 
-__version__ = "0.1.1"
+__version__ = "0.1.2"
 import functools
 import math
 
 """
 changelog
 
+version 0.1.2  2024-04-26  
+-------------------------
+Added all relevant string methods to return istrs or data structures with istrs.
+Added corresponding tests.
+
 version 0.1.0  2024-04-22  
 -------------------------
-Changed the way istr.range is implemenented.
+Changed the way istr.range is implemennted.
 
 Changed the context manager istr.format() to be used directly without the with statement.
 Also, noww istr.format() works without any argument and then returns the current format.
@@ -38,6 +43,7 @@ version 0.0.8  2024-04-18
 initial version with changelog
 """
 
+
 class _range:
     """
     based on https://codereview.stackexchange.com/questions/229073/pure-python-range-implementation
@@ -247,6 +253,8 @@ class istr(str):
             return cls.range(value.start, value.stop, value.step)
         if isinstance(value, _range):
             return value
+        if isinstance(value, cls):
+            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__"):
@@ -258,7 +266,7 @@ class istr(str):
             as_int = 0
         else:
             as_int = cls._to_int(value)
-            if (cls._format == "" or cls._base != 10) and not isinstance(value,istr):
+            if (cls._format == "" or cls._base != 10) and not isinstance(value, istr):
                 if isinstance(value, str):
                     as_str = value
                 else:
@@ -406,10 +414,6 @@ class istr(str):
     def is_odd(self):
         return self._as_int % 2 == 1
 
-    def join(self, iterable):
-        s = super().join(iterable)
-        return self.__class__(s)
-
     def reversed(self):
         return self[::-1]
 
@@ -487,19 +491,94 @@ class istr(str):
             self.saved_cls._base = self.saved_base
 
     @classmethod
-    def range(cls, start,stop=None,step=1):
-        return _range(cls,start,stop,step) 
+    def range(cls, start, stop=None, step=1):
+        return _range(cls, start, stop, step)
+
+    def capitalize1(self, *args, **kwargs):
+        return self.__class__(super().capitalize(*args, **kwargs))
+
+    def casefold(self, *args, **kwargs):
+        return self.__class__(super().casefold(*args, **kwargs))
+
+    def center(self, *args, **kwargs):
+        return self.__class__(super().center(*args, **kwargs))
+
+    def expandtabs(self, *args, **kwargs):
+        return self.__class__(super().expandtabs(*args, **kwargs))
+
+    def join(self, *args, **kwargs):
+        return self.__class__(super().join(*args, **kwargs))
+
+    def ljust(self, *args, **kwargs):
+        return self.__class__(super().ljust(*args, **kwargs))
+
+    def lower(self, *args, **kwargs):
+        return self.__class__(super().lower(*args, **kwargs))
+
+    def lstrip(self, *args, **kwargs):
+        return self.__class__(super().lstrip(*args, **kwargs))
+
+    def partition(self, *args, **kwargs):
+        return self.__class__(super().partition(*args, **kwargs))
+
+    def removeprefix(self, *args, **kwargs):
+        return self.__class__(super().removeprefix(*args, **kwargs))
 
+    def removesuffix(self, *args, **kwargs):
+        return self.__class__(super().removesuffix(*args, **kwargs))
+
+    def replace(self, *args, **kwargs):
+        return self.__class__(super().replace(*args, **kwargs))
+
+    def rjust(self, *args, **kwargs):
+        return self.__class__(super().rjust(*args, **kwargs))
+
+    def rpartition(self, *args, **kwargs):
+        return self.__class__(super().rpartition(*args, **kwargs))
+
+    def rsplit(self, *args, **kwargs):
+        return self.__class__(super().rsplit(*args, **kwargs))
+
+    def rstrip(self, *args, **kwargs):
+        return self.__class__(super().rstrip(*args, **kwargs))
+
+    def split(self, *args, **kwargs):
+        return self.__class__(super().split(*args, **kwargs))
+
+    def strip(self, *args, **kwargs):
+        return self.__class__(super().strip(*args, **kwargs))
+
+    def swapcase(self, *args, **kwargs):
+        return self.__class__(super().swapcase(*args, **kwargs))
+
+    def title(self, *args, **kwargs):
+        return self.__class__(super().title(*args, **kwargs))
+
+    def translate(self, *args, **kwargs):
+        return self.__class__(super().translate(*args, **kwargs))
+
+    def upper(self, *args, **kwargs):
+        return self.__class__(super().upper(*args, **kwargs))
+
+    def zfill(self, *args, **kwargs):
+        return self.__class__(super().zfill(*args, **kwargs))
+
+    f = "capitalize"
+    exec(
+        f"""
+def {f}(self, *args, **kwargs):
+        return self.__class__(super(istr,self).{f}(*args, **kwargs)) 
+""",
+        globals(),
+        locals(),
+    )
 
 
 def main():
-    with istr.base(16):
-        a = istr(15)
-    b = a * a
-    print(b)
-    c=istr(a)
-    print(repr(c))
+    a = istr("123123")
+    print(repr(a.capitalize()))
 
 
 if __name__ == "__main__":
-    main()
+    main()
+

{istr_python-0.1.1 → istr_python-0.1.2}/istr_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: istr-python
-Version: 0.1.1
+Version: 0.1.2
 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-0.1.1 → istr_python-0.1.2}/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 = "0.1.1"
+version = "0.1.2"
 readme = "README.md"
 requires-python = ">=3.7"
 dependencies = [
@@ -21,3 +21,6 @@ classifiers = [
 [project.urls]
 Homepage = "https://github.com/salabim/istr"
 Repository = "https://github.com/salabim/istr"
+
+[tool.setuptools]
+packages = ["istr"]

{istr_python-0.1.1 → istr_python-0.1.2}/tests/test_istr.py

@@ -408,6 +408,33 @@ def test_repr_mode():
     with pytest.raises(TypeError):
         istr.repr_mode("no")
 
+def test_str_methods():
+    a=istr("   123123 ")
+    b=istr("123123")
+    assert a.capitalize().equals(a)
+    assert a.casefold().equals(a)
+    assert a.center(20).equals(istr('        123123      '))
+    assert a.expandtabs(4).equals(a)
+    assert istr("").join(("0","1","2")).equals(istr("012"))
+    assert a.ljust(20).equals(istr('   123123           '))
+    assert a.lower().equals(a)
+    assert a.lstrip().equals(istr('123123 '))
+    assert a.partition("3")==(istr('   12'), istr('3'), istr('123 '))
+    assert a.removeprefix("   12").equals(istr("3123 "))
+    assert a.removesuffix("23 ").equals(istr("   1231"))
+    assert a.replace("1","9").equals(istr("   923923 "))
+    assert a.rjust(20).equals(istr('             123123 '))
+    assert b.partition("2")==(istr('1'), istr('2'), istr('3123'))
+    assert b.rpartition("2")==(istr('1231'), istr('2'), istr('3'))
+    assert b.rsplit("1")==[istr(''), istr('23'), istr('23')]
+    assert a.rstrip().equals(istr('   123123'))
+    assert b.split("1")==[istr(''), istr('23'), istr('23')]
+    assert a.strip().equals(istr('123123'))
+    assert a.swapcase().equals(a)
+    assert a.title().equals(a)
+    assert a.translate({49:  52}).equals(istr('   423423 '))
+    assert a.upper().equals(a)
+    assert b.zfill(10).equals(istr('0000123123'))
 
 def test_base():
     assert istr.base() == 10