lockss-pybasic 0.1.0.dev15__tar.gz → 0.1.0.dev17__tar.gz

{lockss_pybasic-0.1.0.dev15 → lockss_pybasic-0.1.0.dev17}/PKG-INFO

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

{lockss_pybasic-0.1.0.dev15 → lockss_pybasic-0.1.0.dev17}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lockss-pybasic"
-version = "0.1.0-dev15"
+version = "0.1.0-dev17"
 description = "Basic Python utilities"
 authors = [
     { name = "Thib Guicherd-Callin", email = "thib@cs.stanford.edu" }

{lockss_pybasic-0.1.0.dev15 → lockss_pybasic-0.1.0.dev17}/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.1.0-dev15'
+__version__ = '0.1.0-dev17'

{lockss_pybasic-0.1.0.dev15 → lockss_pybasic-0.1.0.dev17}/src/lockss/pybasic/cliutil.py

@@ -89,8 +89,8 @@ class BaseCli(Generic[BaseModelT]):
                       the program.
         """
         super().__init__()
-        self.args: Optional[BaseModelT] = None
-        self.parser: Optional[ArgumentParser] = None
+        self._args: Optional[BaseModelT] = None
+        self._parser: Optional[ArgumentParser] = None
         self.extra: Dict[str, Any] = dict(**extra)
 
     def run(self) -> None:
@@ -107,10 +107,10 @@ class BaseCli(Generic[BaseModelT]):
 
         :return: Nothing.
         """
-        self.parser: ArgumentParser = ArgumentParser(model=self.extra.get('model'),
-                                                     prog=self.extra.get('prog'),
-                                                     description=self.extra.get('description'))
-        self.args = self.parser.parse_typed_args()
+        self._parser: ArgumentParser = ArgumentParser(model=self.extra.get('model'),
+                                                      prog=self.extra.get('prog'),
+                                                      description=self.extra.get('description'))
+        self._args = self._parser.parse_typed_args()
         self.dispatch()
 
     def dispatch(self) -> None:
@@ -121,18 +121,18 @@ class BaseCli(Generic[BaseModelT]):
 
         :return: Nothing.
         """
-        field_names = self.args.__class__.__fields__.keys()
+        field_names = self._args.__class__.__fields__.keys()
         for field_name in field_names:
-            field_value = getattr(self.args, field_name)
+            field_value = getattr(self._args, field_name)
             if issubclass(type(field_value), BaseModel):
                 func = getattr(self, f'_{field_name}')
                 if callable(func):
                     func(field_value)
                 else:
-                    self.parser.exit(1, f'internal error: no _{field_name} callable for the {field_name} command')
+                    self._parser.exit(1, f'internal error: no _{field_name} callable for the {field_name} command')
                 break
         else:
-            self.parser.error(f'unknown command; expected one of {', '.join(field_names)}')
+            self._parser.error(f'unknown command; expected one of {', '.join(field_names)}')
 
 
 def at_most_one_from_enum(model_cls, values: Dict[str, Any], enum_cls) -> Dict[str, Any]: