lockss-pybasic 0.2.0.dev4__tar.gz → 0.2.0.dev5__tar.gz

{lockss_pybasic-0.2.0.dev4 → lockss_pybasic-0.2.0.dev5}/PKG-INFO

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

{lockss_pybasic-0.2.0.dev4 → lockss_pybasic-0.2.0.dev5}/pyproject.toml

@@ -28,7 +28,7 @@
 
 [project]
 name = "lockss-pybasic"
-version = "0.2.0-dev4" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
+version = "0.2.0-dev5" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
 description = "Basic Python utilities"
 license = { text = "BSD-3-Clause" }
 readme = "README.rst"

{lockss_pybasic-0.2.0.dev4 → lockss_pybasic-0.2.0.dev5}/src/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-dev4'
+__version__ = '0.2.0-dev5'

{lockss_pybasic-0.2.0.dev4 → lockss_pybasic-0.2.0.dev5}/src/lockss/pybasic/cliutil.py

@@ -35,6 +35,7 @@ Command line utilities.
 from collections.abc import Callable
 import sys
 from typing import Any, ClassVar, Dict, Generic, Optional, TypeVar, TYPE_CHECKING
+import warnings
 
 from pydantic.v1 import BaseModel, PrivateAttr, create_model
 from pydantic.v1.fields import FieldInfo
@@ -51,14 +52,16 @@ else:
 class StringCommand(BaseModel):
 
     def display(self, file: SupportsWriteStr=sys.stdout) -> None:
-        print(getattr(self, 'display_string'), file=file)
+        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):