istr-python 1.1.1__tar.gz → 1.1.3__tar.gz

{istr_python-1.1.1 → istr_python-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: istr-python
-Version: 1.1.1
+Version: 1.1.3
 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
@@ -28,10 +28,9 @@ M O N E Y
 ```
 can be nicely, albeit not very efficient, coded as:
 ```
-import itertools
-from istr import istr
+import istr
 
-for s, e, n, d, m, o, r, y in istr(itertools.permutations(range(10), 8)):
+for s, e, n, d, m, o, r, y in istr.permutations(range(10), 8):
     if m and ((s|e|n|d) + (m|o|r|e) == (m|o|n|e|y)):
         print(f' {s|e|n|d}')
         print(f' {m|o|r|e}')
@@ -50,11 +49,11 @@ And the module is a demonstration of extending a class (str) with extra and chan
 ### Installation
 Installing istr with pip is easy.
 ```
-$ pip install istr-python
+pip install istr-python
 ```
 or when you want to upgrade,
 ```
-$ pip install istr-python --upgrade
+pip install istr-python --upgrade
 ```
 Alternatively, istr.py can be just copied into you current work directory from GitHub (https://github.com/salabim/istr).
 
@@ -65,13 +64,19 @@ No dependencies!
 
 Just start with
 
+```
+import istr
+```
+
+or the more conventional, more verbose:
+
 ```
 from istr import istr
 ```
 
 #### Use istr as int
 
-We can define an istr:
+We can define an istr, like:
 ```
 four = istr('4')
 five = istr('5')
@@ -81,7 +86,7 @@ The variables `four`  and `five` can now be used as if they were int:
 ```
 twenty = four * five
 ```
-, after which x is `istr('20')`
+, after which twenty is `istr('20')`
 
 The same can be done with
 
@@ -106,7 +111,7 @@ is `istr('16')`
 We can do all the usual arithmetic operations on istrs, e.g.
 
 ```
--four + (twenty / 2)
+- four + (twenty / 2)
 ```
 
 is `istr('6')`
@@ -118,7 +123,7 @@ twenty == 20
 ```
 is True.
 
-But istrs are also strings. So
+But istrs are actually strings! So
 
 ```
 twenty == '20'
@@ -126,7 +131,7 @@ twenty == '20'
 
 is also True!
 
-For the order comparisons (<=, <, >, >=), the istr is always interpreted as an int.
+For the order comparisons (<=, <, >, >=), an istr is always interpreted as an int.
 
 That means that  
 ```
@@ -151,11 +156,10 @@ four, five = istr(4, 5)
 ```
 
 ##### Important
->
-> All calculations are strictly integer calculations. That means that if a float or decimal variable is ever produced it will be converted to an int.
+>All calculations are strictly integer calculations. That means that if a float or decimal variable is ever produced it will be converted to an int.
 > Also divisions are always floor divisions!
 
-#### Use istr as str
+#### Use istr as a string
 
 We should realize that istrs are in fact strings.
 
@@ -238,11 +242,13 @@ is `False`.
 The `bool` operator works normally on the integer value of an istr. So
 
 `bool(istr('0'))` ==> `False`
+
 `bool(istr('1'))` ==> `True`
 
 But if the istr can't be interpreted as an int, the string value will be used to test. So
 
 `bool(istr('abc'))` ==> `True`
+
 `bool(istr(''))` ==> `False`
 
 #### Other operators
@@ -506,7 +512,7 @@ to `istr` and then concatenate these.
 
 ```
 list(istr.concat(((1,2),(3,4))) ==> istr([12,34])
-list(istr.concat(itertools.permutations(range(3),2))) ==> 
+list(istr.concat(istr.permutations(range(3),2))) ==> 
     [istr('01'), istr('02'), istr('10'), istr('12'), istr('20'), istr('21')] 
 ```
 
@@ -558,7 +564,7 @@ When a class is derived from istr, all methods will return that newly derived cl
 
 E.g.
 ```
-class jstr(istr):
+class jstr(istr.type):
     ...
     
 print(repr(jstr(4) * jstr(5)))
@@ -761,7 +767,9 @@ There's an extensive pytest script in the `\tests` directory.
 
 This script also shows clearly the ways istr can be used, including several edge cases. Highly recommended to have a look at.
 
+###  Contact info
 
+You can contact Ruud van der Ham, the core developer, via ruud@salabim.org .
 
 ### Badges
 ![PyPI](https://img.shields.io/pypi/v/istr-python) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/istr-python) ![PyPI - Implementation](https://img.shields.io/pypi/implementation/istr-python)

{istr_python-1.1.1 → istr_python-1.1.3}/README.md

@@ -15,10 +15,9 @@ M O N E Y
 ```
 can be nicely, albeit not very efficient, coded as:
 ```
-import itertools
-from istr import istr
+import istr
 
-for s, e, n, d, m, o, r, y in istr(itertools.permutations(range(10), 8)):
+for s, e, n, d, m, o, r, y in istr.permutations(range(10), 8):
     if m and ((s|e|n|d) + (m|o|r|e) == (m|o|n|e|y)):
         print(f' {s|e|n|d}')
         print(f' {m|o|r|e}')
@@ -37,11 +36,11 @@ And the module is a demonstration of extending a class (str) with extra and chan
 ### Installation
 Installing istr with pip is easy.
 ```
-$ pip install istr-python
+pip install istr-python
 ```
 or when you want to upgrade,
 ```
-$ pip install istr-python --upgrade
+pip install istr-python --upgrade
 ```
 Alternatively, istr.py can be just copied into you current work directory from GitHub (https://github.com/salabim/istr).
 
@@ -52,13 +51,19 @@ No dependencies!
 
 Just start with
 
+```
+import istr
+```
+
+or the more conventional, more verbose:
+
 ```
 from istr import istr
 ```
 
 #### Use istr as int
 
-We can define an istr:
+We can define an istr, like:
 ```
 four = istr('4')
 five = istr('5')
@@ -68,7 +73,7 @@ The variables `four`  and `five` can now be used as if they were int:
 ```
 twenty = four * five
 ```
-, after which x is `istr('20')`
+, after which twenty is `istr('20')`
 
 The same can be done with
 
@@ -93,7 +98,7 @@ is `istr('16')`
 We can do all the usual arithmetic operations on istrs, e.g.
 
 ```
--four + (twenty / 2)
+- four + (twenty / 2)
 ```
 
 is `istr('6')`
@@ -105,7 +110,7 @@ twenty == 20
 ```
 is True.
 
-But istrs are also strings. So
+But istrs are actually strings! So
 
 ```
 twenty == '20'
@@ -113,7 +118,7 @@ twenty == '20'
 
 is also True!
 
-For the order comparisons (<=, <, >, >=), the istr is always interpreted as an int.
+For the order comparisons (<=, <, >, >=), an istr is always interpreted as an int.
 
 That means that  
 ```
@@ -138,11 +143,10 @@ four, five = istr(4, 5)
 ```
 
 ##### Important
->
-> All calculations are strictly integer calculations. That means that if a float or decimal variable is ever produced it will be converted to an int.
+>All calculations are strictly integer calculations. That means that if a float or decimal variable is ever produced it will be converted to an int.
 > Also divisions are always floor divisions!
 
-#### Use istr as str
+#### Use istr as a string
 
 We should realize that istrs are in fact strings.
 
@@ -225,11 +229,13 @@ is `False`.
 The `bool` operator works normally on the integer value of an istr. So
 
 `bool(istr('0'))` ==> `False`
+
 `bool(istr('1'))` ==> `True`
 
 But if the istr can't be interpreted as an int, the string value will be used to test. So
 
 `bool(istr('abc'))` ==> `True`
+
 `bool(istr(''))` ==> `False`
 
 #### Other operators
@@ -493,7 +499,7 @@ to `istr` and then concatenate these.
 
 ```
 list(istr.concat(((1,2),(3,4))) ==> istr([12,34])
-list(istr.concat(itertools.permutations(range(3),2))) ==> 
+list(istr.concat(istr.permutations(range(3),2))) ==> 
     [istr('01'), istr('02'), istr('10'), istr('12'), istr('20'), istr('21')] 
 ```
 
@@ -545,7 +551,7 @@ When a class is derived from istr, all methods will return that newly derived cl
 
 E.g.
 ```
-class jstr(istr):
+class jstr(istr.type):
     ...
     
 print(repr(jstr(4) * jstr(5)))
@@ -748,7 +754,9 @@ There's an extensive pytest script in the `\tests` directory.
 
 This script also shows clearly the ways istr can be used, including several edge cases. Highly recommended to have a look at.
 
+###  Contact info
 
+You can contact Ruud van der Ham, the core developer, via ruud@salabim.org .
 
 ### Badges
 ![PyPI](https://img.shields.io/pypi/v/istr-python) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/istr-python) ![PyPI - Implementation](https://img.shields.io/pypi/implementation/istr-python)

{istr_python-1.1.1 → istr_python-1.1.3}/istr/istr.py

@@ -5,7 +5,7 @@
 #    |_||___/ \__||_|
 # strings you can count on
 
-__version__ = "1.1.1"
+__version__ = "1.1.3"
 import functools
 import math
 import itertools
@@ -602,10 +602,22 @@ class istr(str):
         cls._digits_cache[key] = result
         return result
         
+istr.type=type(istr(0))
+
 
 def main():
     ...
 
+class istrModule(types.ModuleType):
+    def __call__(self, *args, **kwargs):
+        return istr.__call__(*args, **kwargs)
+    def __setattr__(self, item, value):
+        setattr(istr,item,value)
+    def __getattr__(self, item,):
+        return getattr(istr,item)
+
+sys.modules["istr"].__class__ = istrModule
+
 if __name__ == "__main__":
     main()
 

{istr_python-1.1.1 → istr_python-1.1.3}/istr_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: istr-python
-Version: 1.1.1
+Version: 1.1.3
 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
@@ -28,10 +28,9 @@ M O N E Y
 ```
 can be nicely, albeit not very efficient, coded as:
 ```
-import itertools
-from istr import istr
+import istr
 
-for s, e, n, d, m, o, r, y in istr(itertools.permutations(range(10), 8)):
+for s, e, n, d, m, o, r, y in istr.permutations(range(10), 8):
     if m and ((s|e|n|d) + (m|o|r|e) == (m|o|n|e|y)):
         print(f' {s|e|n|d}')
         print(f' {m|o|r|e}')
@@ -50,11 +49,11 @@ And the module is a demonstration of extending a class (str) with extra and chan
 ### Installation
 Installing istr with pip is easy.
 ```
-$ pip install istr-python
+pip install istr-python
 ```
 or when you want to upgrade,
 ```
-$ pip install istr-python --upgrade
+pip install istr-python --upgrade
 ```
 Alternatively, istr.py can be just copied into you current work directory from GitHub (https://github.com/salabim/istr).
 
@@ -65,13 +64,19 @@ No dependencies!
 
 Just start with
 
+```
+import istr
+```
+
+or the more conventional, more verbose:
+
 ```
 from istr import istr
 ```
 
 #### Use istr as int
 
-We can define an istr:
+We can define an istr, like:
 ```
 four = istr('4')
 five = istr('5')
@@ -81,7 +86,7 @@ The variables `four`  and `five` can now be used as if they were int:
 ```
 twenty = four * five
 ```
-, after which x is `istr('20')`
+, after which twenty is `istr('20')`
 
 The same can be done with
 
@@ -106,7 +111,7 @@ is `istr('16')`
 We can do all the usual arithmetic operations on istrs, e.g.
 
 ```
--four + (twenty / 2)
+- four + (twenty / 2)
 ```
 
 is `istr('6')`
@@ -118,7 +123,7 @@ twenty == 20
 ```
 is True.
 
-But istrs are also strings. So
+But istrs are actually strings! So
 
 ```
 twenty == '20'
@@ -126,7 +131,7 @@ twenty == '20'
 
 is also True!
 
-For the order comparisons (<=, <, >, >=), the istr is always interpreted as an int.
+For the order comparisons (<=, <, >, >=), an istr is always interpreted as an int.
 
 That means that  
 ```
@@ -151,11 +156,10 @@ four, five = istr(4, 5)
 ```
 
 ##### Important
->
-> All calculations are strictly integer calculations. That means that if a float or decimal variable is ever produced it will be converted to an int.
+>All calculations are strictly integer calculations. That means that if a float or decimal variable is ever produced it will be converted to an int.
 > Also divisions are always floor divisions!
 
-#### Use istr as str
+#### Use istr as a string
 
 We should realize that istrs are in fact strings.
 
@@ -238,11 +242,13 @@ is `False`.
 The `bool` operator works normally on the integer value of an istr. So
 
 `bool(istr('0'))` ==> `False`
+
 `bool(istr('1'))` ==> `True`
 
 But if the istr can't be interpreted as an int, the string value will be used to test. So
 
 `bool(istr('abc'))` ==> `True`
+
 `bool(istr(''))` ==> `False`
 
 #### Other operators
@@ -506,7 +512,7 @@ to `istr` and then concatenate these.
 
 ```
 list(istr.concat(((1,2),(3,4))) ==> istr([12,34])
-list(istr.concat(itertools.permutations(range(3),2))) ==> 
+list(istr.concat(istr.permutations(range(3),2))) ==> 
     [istr('01'), istr('02'), istr('10'), istr('12'), istr('20'), istr('21')] 
 ```
 
@@ -558,7 +564,7 @@ When a class is derived from istr, all methods will return that newly derived cl
 
 E.g.
 ```
-class jstr(istr):
+class jstr(istr.type):
     ...
     
 print(repr(jstr(4) * jstr(5)))
@@ -761,7 +767,9 @@ There's an extensive pytest script in the `\tests` directory.
 
 This script also shows clearly the ways istr can be used, including several edge cases. Highly recommended to have a look at.
 
+###  Contact info
 
+You can contact Ruud van der Ham, the core developer, via ruud@salabim.org .
 
 ### Badges
 ![PyPI](https://img.shields.io/pypi/v/istr-python) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/istr-python) ![PyPI - Implementation](https://img.shields.io/pypi/implementation/istr-python)

{istr_python-1.1.1 → istr_python-1.1.3}/pyproject.toml

@@ -1,30 +1,35 @@
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "istr-python"
-authors = [
-    {name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com"}
-]
-description = "istr - strings you can count on"
-version = "1.1.1"
-readme = "README.md"
-requires-python = ">=3.7"
-dependencies = [
-]
-classifiers = [
-  "Development Status :: 5 - Production/Stable",
-  "License :: OSI Approved :: MIT License",
-  "Programming Language :: Python :: 3 :: Only"
-]
-[project.urls]
-Homepage = "https://github.com/salabim/istr"
-Repository = "https://github.com/salabim/istr"
-
-[tool.setuptools]
-packages = ["istr"]
-
-[tool.setuptools.package-data]
-"*" = ["*.txt"]
-
+[build-system]
+requires = [
+    "setuptools",
+]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "istr-python"
+authors = [
+    { name = "Ruud van der Ham", email = "rt.van.der.ham@gmail.com" },
+]
+description = "istr - strings you can count on"
+version = "1.1.3"
+readme = "README.md"
+requires-python = ">=3.7"
+dependencies = []
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3 :: Only",
+]
+
+[project.urls]
+Homepage = "https://github.com/salabim/istr"
+Repository = "https://github.com/salabim/istr"
+
+[tool.setuptools]
+packages = [
+    "istr",
+]
+
+[tool.setuptools.package-data]
+"*" = [
+    "*.txt",
+]

{istr_python-1.1.1 → istr_python-1.1.3}/tests/test_istr.py

@@ -5,14 +5,14 @@ import sys
 import re
 from pathlib import Path
 
-if __name__ == "__main__":  # to make the tests run without the pytest cli
-    file_folder = os.path.dirname(__file__)
-    os.chdir(file_folder)
-    sys.path.insert(0, file_folder + "/../istr") 
+# if __name__ == "__main__":  # to make the tests run without the pytest cli
+#     file_folder = os.path.dirname(__file__)
+#     os.chdir(file_folder)
+#     sys.path.insert(0, file_folder + "/../istr") 
        
 import pytest
 
-from istr import istr
+import istr
 
 istr.equals = lambda self, other: type(self) == type(other) and (str(self) == str(other))
 # this method tests whether self and other are exactly the same
@@ -358,17 +358,17 @@ def test_join():
     s = istr("").join(("4", "5", "6"))
     assert s == "456"
     assert s == 456
-    assert type(s) == istr
+    assert type(s) == istr.type
 
     s = istr("").join(istr(("4", "5", "6")))
     assert s == "456"
     assert s == 456
-    assert type(s) == istr
+    assert type(s) == istr.type
 
     s = istr("").join(istr(("", "", "6")))
     assert s == "6"
     assert s == 6
-    assert type(s) == istr
+    assert type(s) == istr.type
 
 
 def test_or():
@@ -677,7 +677,8 @@ def test_all_distinct():
 
 
 def test_subclassing():
-    class jstr(istr): ...
+    class jstr(istr.type):
+        ...
 
     assert jstr(5).equals(jstr(5))
     assert repr(jstr(*range(3))) == "(jstr('0'), jstr('1'), jstr('2'))"