lockss-pybasic 0.3.0.dev7__tar.gz → 0.3.0.dev8__tar.gz

{lockss_pybasic-0.3.0.dev7 → lockss_pybasic-0.3.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lockss-pybasic
-Version: 0.3.0.dev7
+Version: 0.3.0.dev8
 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-dev7
+.. |RELEASE| replace:: 0.3.0-dev8
 .. |RELEASE_DATE| replace:: NOT YET RELEASED
 
 **Latest release:** |RELEASE| (|RELEASE_DATE|)

{lockss_pybasic-0.3.0.dev7 → lockss_pybasic-0.3.0.dev8}/README.rst

@@ -2,7 +2,7 @@
 lockss-pybasic
 ==============
 
-.. |RELEASE| replace:: 0.3.0-dev7
+.. |RELEASE| replace:: 0.3.0-dev8
 .. |RELEASE_DATE| replace:: NOT YET RELEASED
 
 **Latest release:** |RELEASE| (|RELEASE_DATE|)

{lockss_pybasic-0.3.0.dev7 → lockss_pybasic-0.3.0.dev8}/pyproject.toml

@@ -28,7 +28,7 @@
 
 [project]
 name = "lockss-pybasic"
-version = "0.3.0-dev7" # Always change in __init__.py, and at release time in README.rst and CHANGELOG.rst
+version = "0.3.0-dev8" # 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.3.0.dev7 → lockss_pybasic-0.3.0.dev8}/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.3.0-dev7'
+__version__ = '0.3.0-dev8'

{lockss_pybasic-0.3.0.dev7 → lockss_pybasic-0.3.0.dev8}/src/lockss/pybasic/nodeutil.py

@@ -77,8 +77,7 @@ class BaseNodeSpec(BaseModel):
     kind: NodeSpecKind = Field(title='Kind',
                                description="This object's kind")
 
-    id: NodeIdentifier = Field(default='',
-                               title='Node Identifier',
+    id: NodeIdentifier = Field(title='Node Identifier',
                                description='An identifier for the node')
 
     protocol: NodeProtocolEnum = Field(default=DEFAULT_PROTOCOL,
@@ -99,9 +98,6 @@ class NodeSpec1(BaseNodeSpec):
                            title='UI Port',
                            description="The LOCKSS 1.x node's Web user interface port")
 
-    def __str__(self) -> str:
-        return f'{self.protocol.value}://{self.host}:{self.ui}'
-
 
 class NodeSpec2(BaseNodeSpec):
 
@@ -143,9 +139,6 @@ class NodeSpec2(BaseNodeSpec):
                              title='SOAP Port',
                              description="The node's SOAP Compatibility Service REST API Port")
 
-    def __str__(self) -> str:
-        return f'{self.protocol.value}://{self.host}:{self.repository}:{self.configuration}:{self.poller}:{self.crawler}:{self.metadata}:{self.soap}'
-
 
 _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+))?)?)?)?)?)?')
 
@@ -158,7 +151,7 @@ def _parse_compact_node_spec(compact_node_spec: CompactNodeSpec) -> dict[str, st
     mat: Optional[Match[str]] = _RE_COMPACT_NODE_SPEC.fullmatch(compact_node_spec)
     if mat is None:
         raise ValueError(f'Invalid compact node specification: {compact_node_spec}')
-    d = dict(kind='NodeSpec', host=mat.group('host'))
+    d = dict(kind='NodeSpec', id=compact_node_spec, host=mat.group('host'))
     if prot := mat.group('protocol'):
         d['protocol'] = prot
     five = ('configuration', 'poller', 'crawler', 'metadata', 'soap')