Merge pull request #42 from casework/AC-208

Complete transfer of case_utils.guess_format

Author: ajnelson-nist

case_utils/__init__.py

@@ -13,20 +13,4 @@
 
 __version__ = "0.3.0"
 
-import typing
-import warnings
-
-import rdflib.util  # type: ignore
-
 from . import local_uuid
-
-
-def guess_format(
-    fpath: str, fmap: typing.Optional[typing.Dict[str, str]] = None
-) -> typing.Optional[str]:
-    warnings.warn(
-        "The functionality in case_utils.guess_format is now upstream.  Please revise your code to use rdflib.util.guess_format.  The function arguments remain the same.  case_utils.guess_format will be removed in case_utils 0.4.0.",
-        DeprecationWarning,
-    )
-
-    return rdflib.util.guess_format(fpath, fmap)  # type: ignore

case_utils/case_file/__init__.py

@@ -244,7 +244,7 @@ def main() -> None:
 
     output_format = None
     if args.output_format is None:
-        output_format = case_utils.guess_format(args.out_graph)
+        output_format = rdflib.util.guess_format(args.out_graph)
     else:
         output_format = args.output_format
 

case_utils/case_sparql_construct/__init__.py

@@ -103,7 +103,7 @@ def main() -> None:
 
     output_format = None
     if args.output_format is None:
-        output_format = case_utils.guess_format(args.out_graph)
+        output_format = rdflib.util.guess_format(args.out_graph)
     else:
         output_format = args.output_format
 

tests/case_utils/test_guess_format.py

@@ -64,51 +64,3 @@ def test_rdflib_util_guess_format_jsonld() -> None:
     assert (
         rdflib.util.guess_format(PATH_TO_JSONLD) == "json-ld"
     ), "Failed to recognize .jsonld RDF file extension"
-
-
-def test_case_utils_guess_format_ttl_default() -> None:
-    assert (
-        case_utils.guess_format(PATH_TO_TTL) == "turtle"
-    ), "Failed to recognize .ttl RDF file extension"
-
-
-@pytest.mark.xfail(
-    reason="Preserving behavior - rdflib 5.0.0 guess_format fmap argument overwrites base module's extension map",
-    strict=True,
-)
-def test_case_utils_guess_format_ttl_fmap() -> None:
-    assert (
-        case_utils.guess_format(PATH_TO_TTL, FMAP_XHTML_GRDDL) == "turtle"
-    ), "Failed to recognize .ttl RDF file extension when using fmap"
-
-
-def test_case_utils_guess_format_json_default() -> None:
-    assert (
-        case_utils.guess_format(PATH_TO_JSON) == "json-ld"
-    ), "Failed to recognize .json RDF file extension"
-
-
-@pytest.mark.xfail(
-    reason="Preserving behavior - rdflib 5.0.0 guess_format fmap argument overwrites base module's extension map",
-    strict=True,
-)
-def test_case_utils_guess_format_json_fmap() -> None:
-    assert (
-        case_utils.guess_format(PATH_TO_JSON, FMAP_XHTML_GRDDL) == "json-ld"
-    ), "Failed to recognize .json RDF file extension when using fmap"
-
-
-def test_case_utils_guess_format_jsonld_default() -> None:
-    assert (
-        case_utils.guess_format(PATH_TO_JSONLD) == "json-ld"
-    ), "Failed to recognize .jsonld RDF file extension"
-
-
-@pytest.mark.xfail(
-    reason="Preserving behavior - rdflib 5.0.0 guess_format fmap argument overwrites base module's extension map",
-    strict=True,
-)
-def test_case_utils_guess_format_jsonld_fmap() -> None:
-    assert (
-        case_utils.guess_format(PATH_TO_JSONLD, FMAP_XHTML_GRDDL) == "json-ld"
-    ), "Failed to recognize .jsonld RDF file extension when using fmap"