From 7621f7f85501ffa6ff78fe9973c476c5e9fb04f8 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 25 Jul 2023 07:42:23 -0400 Subject: [PATCH] Use typing symbols directly This patch partially implements a small piece of PR 118. References: * https://github.com/casework/CASE-Utilities-Python/pull/118 Requested-by: kchason Signed-off-by: Alex Nelson --- case_utils/case_validate/__init__.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/case_utils/case_validate/__init__.py b/case_utils/case_validate/__init__.py index 5ef2952..6deaaa0 100644 --- a/case_utils/case_validate/__init__.py +++ b/case_utils/case_validate/__init__.py @@ -36,8 +36,8 @@ import logging import os import sys -import typing import warnings +from typing import Dict, Set, Tuple, Union import pyshacl # type: ignore import rdflib @@ -182,7 +182,7 @@ def main() -> None: ontology_graph.parse(arg_ontology_graph) # Construct set of CDO concepts for data graph concept-existence review. - cdo_concepts: typing.Set[rdflib.URIRef] = set() + cdo_concepts: Set[rdflib.URIRef] = set() for n_structural_class in [ NS_OWL.Class, @@ -230,7 +230,7 @@ def main() -> None: continue cdo_concepts.add(rdflib.URIRef(cleaned_line)) - data_cdo_concepts: typing.Set[rdflib.URIRef] = set() + data_cdo_concepts: Set[rdflib.URIRef] = set() for data_triple in data_graph.triples((None, None, None)): for data_triple_member in data_triple: if isinstance(data_triple_member, rdflib.URIRef): @@ -255,13 +255,11 @@ def main() -> None: # determination by output file extension. case_validate will defer # to pySHACL behavior, as other CASE tools don't (at the time of # this writing) have the value "human" as an output format. - validator_kwargs: typing.Dict[str, str] = dict() + validator_kwargs: Dict[str, str] = dict() if args.format != "human": validator_kwargs["serialize_report_graph"] = args.format - validate_result: typing.Tuple[ - bool, typing.Union[Exception, bytes, str, rdflib.Graph], str - ] + validate_result: Tuple[bool, Union[Exception, bytes, str, rdflib.Graph], str] validate_result = pyshacl.validate( data_graph, shacl_graph=ontology_graph,