Address feedback

Author: mschoettle

src/check_jsonschema/cli/main_command.py

@@ -163,7 +163,7 @@ def pretty_helptext_list(values: list[str] | tuple[str, ...]) -> str:
 )
 @click.option(
     "--force-filetype",
-    help="Force a file typr to use for the file",
+    help="Force a file type to use when parsing instance files",
     type=click.Choice(SUPPORTED_FILE_FORMATS, case_sensitive=True),
 )
 @click.option(

src/check_jsonschema/parsers/__init__.py

@@ -68,13 +68,14 @@ def get(
         self,
         path: pathlib.Path | str,
         default_filetype: str,
-        force_filetype: str | None,
+        force_filetype: str | None = None,
     ) -> t.Callable[[t.IO[bytes]], t.Any]:
-        filetype = path_to_type(path, default_type=default_filetype)
+        if force_filetype:
+            filetype = force_filetype
+        else:
+            filetype = path_to_type(path, default_type=default_filetype)
 
         if filetype in self._by_tag:
-            filetype = force_filetype or filetype
-
             return self._by_tag[filetype]
 
         if filetype in MISSING_SUPPORT_MESSAGES:
@@ -92,7 +93,7 @@ def parse_data_with_path(
         data: t.IO[bytes] | bytes,
         path: pathlib.Path | str,
         default_filetype: str,
-        force_filetype: str | None,
+        force_filetype: str | None = None,
     ) -> t.Any:
         loadfunc = self.get(path, default_filetype, force_filetype)
         try:
@@ -106,7 +107,7 @@ def parse_file(
         self,
         path: pathlib.Path | str,
         default_filetype: str,
-        force_filetype: str | None,
+        force_filetype: str | None = None,
     ) -> t.Any:
         with open(path, "rb") as fp:
             return self.parse_data_with_path(fp, path, default_filetype, force_filetype)

src/check_jsonschema/schema_loader/readers.py

@@ -44,9 +44,7 @@ def get_retrieval_uri(self) -> str | None:
         return self.path.as_uri()
 
     def _read_impl(self) -> t.Any:
-        return self.parsers.parse_file(
-            self.path, default_filetype="json", force_filetype=None
-        )
+        return self.parsers.parse_file(self.path, default_filetype="json")
 
     def read_schema(self) -> dict:
         if self._parsed_schema is _UNSET:
@@ -86,10 +84,7 @@ def __init__(
 
     def _parse(self, schema_bytes: bytes) -> t.Any:
         return self.parsers.parse_data_with_path(
-            io.BytesIO(schema_bytes),
-            self.url,
-            default_filetype="json",
-            force_filetype=None,
+            io.BytesIO(schema_bytes), self.url, default_filetype="json"
         )
 
     def get_retrieval_uri(self) -> str | None:

src/check_jsonschema/schema_loader/resolver.py

@@ -54,7 +54,7 @@ def create_retrieve_callable(
 
     def get_local_file(uri: str) -> t.Any:
         path = filename2path(uri)
-        return parser_set.parse_file(path, "json", None)
+        return parser_set.parse_file(path, "json")
 
     def retrieve_reference(uri: str) -> referencing.Resource[Schema]:
         scheme = urllib.parse.urlsplit(uri).scheme
@@ -70,17 +70,15 @@ def retrieve_reference(uri: str) -> referencing.Resource[Schema]:
         if full_uri_scheme in ("http", "https"):
 
             def validation_callback(content: bytes) -> None:
-                parser_set.parse_data_with_path(content, full_uri, "json", None)
+                parser_set.parse_data_with_path(content, full_uri, "json")
 
             bound_downloader = downloader.bind(
                 full_uri, validation_callback=validation_callback
             )
             with bound_downloader.open() as fp:
                 data = fp.read()
 
-            parsed_object = parser_set.parse_data_with_path(
-                data, full_uri, "json", None
-            )
+            parsed_object = parser_set.parse_data_with_path(data, full_uri, "json")
         else:
             parsed_object = get_local_file(full_uri)
 

tests/unit/test_instance_loader.py

@@ -103,6 +103,7 @@ def test_instanceloader_force_filetype_toml(
     assert data == [(str(f), {"foo": {"bar": "baz"}})]
 
 
+@pytest.mark.skipif(not JSON5_ENABLED, reason="test requires json5")
 @pytest.mark.parametrize(
     "filename, force_filetype",
     [
@@ -113,8 +114,6 @@ def test_instanceloader_force_filetype_toml(
 def test_instanceloader_force_filetype_json(
     tmp_path, filename, force_filetype, open_wide
 ):
-    if not JSON5_ENABLED:
-        pytest.skip("test requires json5")
     f = tmp_path / filename
     f.write_text("// a comment\n{}")
     loader = InstanceLoader(open_wide(f), force_filetype=force_filetype)