lockss-pybasic 0.2.0.dev3__py3-none-any.whl → 0.2.0.dev5__py3-none-any.whl

lockss/pybasic/__init__.py

@@ -36,4 +36,4 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 '''.strip()
 
-__version__ = '0.2.0-dev3'
+__version__ = '0.2.0-dev5'

lockss/pybasic/cliutil.py

@@ -35,9 +35,7 @@ Command line utilities.
 from collections.abc import Callable
 import sys
 from typing import Any, ClassVar, Dict, Generic, Optional, TypeVar, TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from _typeshed import SupportsWrite
+import warnings
 
 from pydantic.v1 import BaseModel, PrivateAttr, create_model
 from pydantic.v1.fields import FieldInfo
@@ -45,18 +43,25 @@ from pydantic_argparse import ArgumentParser
 from pydantic_argparse.argparse.actions import SubParsersAction
 from rich_argparse import RichHelpFormatter
 
+if TYPE_CHECKING:
+    from _typeshed import SupportsWrite as SupportsWriteStr
+else:
+    SupportsWriteStr = Any
+
 
 class StringCommand(BaseModel):
 
-    def display(self, file: SupportsWrite[str]=sys.stdout) -> None:
-        print(getattr(self, 'display_string'), file=file)
+    def display(self, file: SupportsWriteStr=sys.stdout) -> None:
+        print(getattr(self, '_display_string'), file=file)
 
     @staticmethod
     def make(model_name: str, option_name: str, description: str, display_string: str):
-        return create_model(model_name,
-                            __base__=StringCommand,
-                            **{option_name: (Optional[bool], FieldInfo(False, description=description)),
-                               display_string: PrivateAttr(display_string)})
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore")  # Pydantic v1 demands that PrivateAttr begins with a hyphen but raises a warning that such names are for private attributes
+            return create_model(model_name,
+                                __base__=StringCommand,
+                                _display_string=PrivateAttr(display_string),
+                                **{option_name: (Optional[bool], FieldInfo(False, description=description))})
 
 
 class CopyrightCommand(StringCommand):

{lockss_pybasic-0.2.0.dev3.dist-info → lockss_pybasic-0.2.0.dev5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lockss-pybasic
-Version: 0.2.0.dev3
+Version: 0.2.0.dev5
 Summary: Basic Python utilities
 License: BSD-3-Clause
 Author: Thib Guicherd-Callin

lockss_pybasic-0.2.0.dev5.dist-info/RECORD

@@ -0,0 +1,9 @@
+lockss/pybasic/__init__.py,sha256=-Q8lj5dmHarJid06shaGAk79FNGd3QUDDyFCPMVOeAY,1678
+lockss/pybasic/cliutil.py,sha256=PaMrDg2eGMx_h1JEybvgLlXnvxV09CYlEFBIHS1urgA,11475
+lockss/pybasic/errorutil.py,sha256=XI84PScZ851_-gfoazivJ8ceieMYWaxQr7qih5ltga0,1951
+lockss/pybasic/fileutil.py,sha256=BpdoPWL70xYTuhyQRBEurScRVnPQg0mX-XW8yyKPGjw,2958
+lockss/pybasic/outpututil.py,sha256=JyXKXlkaCcCGvonUvmDGRdI6PxwN5t7DPVIk64S8-2g,2345
+lockss_pybasic-0.2.0.dev5.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
+lockss_pybasic-0.2.0.dev5.dist-info/METADATA,sha256=QhQmvLDES42rAOQTuNcbd_8J7IEX8hKut4uK2L5gmrQ,4247
+lockss_pybasic-0.2.0.dev5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+lockss_pybasic-0.2.0.dev5.dist-info/RECORD,,

lockss_pybasic-0.2.0.dev3.dist-info/RECORD

@@ -1,9 +0,0 @@
-lockss/pybasic/__init__.py,sha256=MxiRIu7H0y8ISCRj4PtTzlNH0hPQ9wvEawdO1nMjFpA,1678
-lockss/pybasic/cliutil.py,sha256=LppP6O1Ocj0d5bxtXUPShAYMOTeotQywKkaPd63xhQ0,11185
-lockss/pybasic/errorutil.py,sha256=XI84PScZ851_-gfoazivJ8ceieMYWaxQr7qih5ltga0,1951
-lockss/pybasic/fileutil.py,sha256=BpdoPWL70xYTuhyQRBEurScRVnPQg0mX-XW8yyKPGjw,2958
-lockss/pybasic/outpututil.py,sha256=JyXKXlkaCcCGvonUvmDGRdI6PxwN5t7DPVIk64S8-2g,2345
-lockss_pybasic-0.2.0.dev3.dist-info/LICENSE,sha256=O9ONND4uDxY_jucI4jZDf2liAk05ScEJaYu-Al7EOdQ,1506
-lockss_pybasic-0.2.0.dev3.dist-info/METADATA,sha256=ijdZVGfvh1NBR4vHPYvUSOd02cqSbmLooDMEHZbpUAM,4247
-lockss_pybasic-0.2.0.dev3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lockss_pybasic-0.2.0.dev3.dist-info/RECORD,,