lockss-pybasic 0.3.0.dev5__py3-none-any.whl → 0.3.0.dev6__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.3.0-dev5'
+__version__ = '0.3.0-dev6'

lockss/pybasic/nodeutil.py

@@ -128,17 +128,17 @@ class NodeSpec2(BaseNodeSpec):
                              description="The node's SOAP Compatibility Service REST API Port")
 
 
-_RE_NODE_REFERENCE: Pattern[str] = re.compile(r'((?P<protocol>https?)://)?(?P<host>[^:]+)(:(?P<repository>\d+|(?=:))(:(?P<configuration>\d+|(?=:))(:(?P<poller>\d+|(?=:))(:(?P<crawler>\d+|(?=:))(:(?P<metadata>\d+|(?=:))(:(?P<soap>\d+))?)?)?)?)?)?')
+_RE_COMPACT_NODE_SPEC: Pattern[str] = re.compile(r'((?P<protocol>https?)://)?(?P<host>[^:]+)(:(?P<repository>\d+|(?=:))(:(?P<configuration>\d+|(?=:))(:(?P<poller>\d+|(?=:))(:(?P<crawler>\d+|(?=:))(:(?P<metadata>\d+|(?=:))(:(?P<soap>\d+))?)?)?)?)?)?')
 
 
 #: A type for LOCKSS node specification strings.
-NodeSpecStr = str
+CompactNodeSpec = str
 
 
-def _parse_node_spec_string(node_spec_string: NodeSpecStr) -> dict[str, str]:
-    mat: Optional[Match[str]] = _RE_NODE_REFERENCE.fullmatch(node_spec_string)
+def _parse_compact_node_spec(compact_node_spec: CompactNodeSpec) -> dict[str, str]:
+    mat: Optional[Match[str]] = _RE_COMPACT_NODE_SPEC.fullmatch(compact_node_spec)
     if mat is None:
-        raise ValueError(f'Invalid node specification string: {node_spec_string}')
+        raise ValueError(f'Invalid compact node specification: {compact_node_spec}')
     d = dict(host=mat.group('host'))
     if prot := mat.group('protocol'):
         d['protocol'] = prot
@@ -153,7 +153,7 @@ def _parse_node_spec_string(node_spec_string: NodeSpecStr) -> dict[str, str]:
             d['type'] = NodeTypeEnum.V1.value
             d['ui'] = repo_or_ui
         else:
-            raise ValueError(f'Invalid repository/UI port in node specification string: {repo_or_ui}')
+            raise ValueError(f'Invalid repository/UI port in compact node specification: {repo_or_ui}')
     else:
         # Assume V2
         d['type'] = NodeTypeEnum.V2.value
@@ -163,17 +163,17 @@ def _parse_node_spec_string(node_spec_string: NodeSpecStr) -> dict[str, str]:
     return d
 
 
-def _maybe_deserialize_node_spec_string(value: Any) -> Any:
-    if isinstance(value, NodeSpecStr) and not value.startswith('{'):
-        return _parse_node_spec_string(value)
+def _maybe_deserialize_compact_node_spec(value: Any) -> Any:
+    if isinstance(value, CompactNodeSpec) and not value.startswith('{'):
+        return _parse_compact_node_spec(value)
     return value
 
 
 #: A type for LOCKSS node specifications, that also accepts a compact LOCKSS
-#: node specification string.
+#: node specification.
 NodeSpec = Annotated[
     Annotated[Union[NodeSpec1, NodeSpec2], Field(discriminator='type')],
-    BeforeValidator(_maybe_deserialize_node_spec_string)
+    BeforeValidator(_maybe_deserialize_compact_node_spec)
 ]
 
 

{lockss_pybasic-0.3.0.dev5.dist-info → lockss_pybasic-0.3.0.dev6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lockss-pybasic
-Version: 0.3.0.dev5
+Version: 0.3.0.dev6
 Summary: Basic Python utilities
 License: BSD-3-Clause
 License-File: LICENSE
@@ -26,7 +26,7 @@ Description-Content-Type: text/x-rst
 lockss-pybasic
 ==============
 
-.. |RELEASE| replace:: 0.3.0-dev5
+.. |RELEASE| replace:: 0.3.0-dev6
 .. |RELEASE_DATE| replace:: NOT YET RELEASED
 
 **Latest release:** |RELEASE| (|RELEASE_DATE|)
@@ -68,3 +68,9 @@ Release Notes
 
 See `<CHANGELOG.rst>`_.
 
+----------
+Unit Tests
+----------
+
+Run ``python -m unittest discover tests`` at the root of the project tree (where there is a directory called ``tests``).
+

lockss_pybasic-0.3.0.dev6.dist-info/RECORD

@@ -0,0 +1,10 @@
+lockss/pybasic/__init__.py,sha256=CadXEjtP9aw_ojXq1X15LcxIM8jsPDp71g-wailK6vM,1678
+lockss/pybasic/auidutil.py,sha256=Q4vjjGfymiXVwPu35RyyLZBnViv8mDJKCjOyJb-sbS8,13921
+lockss/pybasic/cliutil.py,sha256=-o5YIh5JPDxwyZ61U9iZshsmzYwOHW-HHFa2ndFO__g,8130
+lockss/pybasic/errorutil.py,sha256=4EaO0a1yIG1DbWltASeT15bg1bGg5kOYspsW0iJdVLc,1951
+lockss/pybasic/fileutil.py,sha256=P_XW_UX6hVvP45vRV8fduclbGmoFflW83a6ZfFE-8Hc,2966
+lockss/pybasic/nodeutil.py,sha256=DquB0bVdgfZHCTfu2xMZpEQ-oVzBc9ArHRiAKBOozmI,7931
+lockss_pybasic-0.3.0.dev6.dist-info/METADATA,sha256=UjX2kivXGti545A930Ce9BDVZILZjkCRtN4Dsf-53aw,2494
+lockss_pybasic-0.3.0.dev6.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
+lockss_pybasic-0.3.0.dev6.dist-info/licenses/LICENSE,sha256=EOxPunNz3XP6AjgbPFolu-d9BS_AF9TtKn1WXgeYPsE,1506
+lockss_pybasic-0.3.0.dev6.dist-info/RECORD,,

lockss_pybasic-0.3.0.dev5.dist-info/RECORD

@@ -1,10 +0,0 @@
-lockss/pybasic/__init__.py,sha256=XiPgHX6Sah_mC2zIQLn_vTG1Celb8_sl1tZoDNm7RYw,1678
-lockss/pybasic/auidutil.py,sha256=Q4vjjGfymiXVwPu35RyyLZBnViv8mDJKCjOyJb-sbS8,13921
-lockss/pybasic/cliutil.py,sha256=-o5YIh5JPDxwyZ61U9iZshsmzYwOHW-HHFa2ndFO__g,8130
-lockss/pybasic/errorutil.py,sha256=4EaO0a1yIG1DbWltASeT15bg1bGg5kOYspsW0iJdVLc,1951
-lockss/pybasic/fileutil.py,sha256=P_XW_UX6hVvP45vRV8fduclbGmoFflW83a6ZfFE-8Hc,2966
-lockss/pybasic/nodeutil.py,sha256=5ocngBCDbeMM7aqGCM10VC314p7VZD0DUMzHrpt3e4s,7911
-lockss_pybasic-0.3.0.dev5.dist-info/METADATA,sha256=jYuOR61q0mUYeB1I_8Uc00K_ac5oW4uavN8gXOVak7I,2338
-lockss_pybasic-0.3.0.dev5.dist-info/WHEEL,sha256=eY7nduwzv-ldUxpzbRlxwvC693Hg6PX8bWDjEHjZ_dk,88
-lockss_pybasic-0.3.0.dev5.dist-info/licenses/LICENSE,sha256=EOxPunNz3XP6AjgbPFolu-d9BS_AF9TtKn1WXgeYPsE,1506
-lockss_pybasic-0.3.0.dev5.dist-info/RECORD,,