Optimize the input parameters of '--base-uri'

Author: willson-chen

jsonschema/cli.py

@@ -7,7 +7,6 @@
 import argparse
 import errno
 import json
-import os
 import sys
 import traceback
 
@@ -16,7 +15,7 @@
 from jsonschema import __version__
 from jsonschema._reflect import namedAny
 from jsonschema.exceptions import SchemaError
-from jsonschema.validators import validator_for, RefResolver
+from jsonschema.validators import RefResolver, validator_for
 
 
 class _CannotLoadFile(Exception):
@@ -261,19 +260,10 @@ def load(_):
                 raise _CannotLoadFile()
         instances = ["<stdin>"]
 
-    if arguments["base_uri"] is None:
-        resolver = None
-    elif arguments["base_uri"] == ".":
-        file_prefix = "file:///{}/" if "nt" == os.name else "file://{}/"
-        resolver = RefResolver(
-                    base_uri=file_prefix.format(os.getcwd()),
+    resolver = RefResolver(
+                    base_uri=arguments["base_uri"],
                     referrer=schema,
-                )
-    else:
-        resolver = RefResolver(
-                        base_uri=arguments["base_uri"],
-                        referrer=schema,
-                    )
+                ) if arguments["base_uri"] is not None else None
 
     validator = arguments["validator"](schema, resolver=resolver)
     exit_code = 0

jsonschema/tests/test_cli.py

@@ -684,59 +684,6 @@ def test_successful_validation_of_just_the_schema_pretty_output(self):
             stderr="",
         )
 
-    def test_successful_validate_with_specifying_base_uri_relative_path(self):
-        try:
-            schema_file = tempfile.NamedTemporaryFile(
-                mode='w+',
-                prefix='schema',
-                suffix='.json',
-                dir='.',
-                delete=False
-            )
-            self.addCleanup(os.remove, schema_file.name)
-            schema = """
-                    {"type": "object", "properties": {"KEY1":
-                    {"$ref": %s%s#definitions/schemas"}},
-                    "definitions": {"schemas": {"type": "string"}}}
-                    """ % ("\"", os.path.basename(schema_file.name))
-            schema_file.write(schema)
-        finally:
-            schema_file.close()
-
-        self.assertOutputs(
-            files=dict(some_schema=schema, some_instance='{"KEY1": "1"}'),
-            argv=["-i", "some_instance", "--base-uri", ".", "some_schema"],
-            stdout="",
-            stderr="",
-        )
-
-    def test_failure_validate_with_specifying_base_uri_relative_path(self):
-        try:
-            schema_file = tempfile.NamedTemporaryFile(
-                mode='w+',
-                prefix='schema',
-                suffix='.json',
-                dir='.',
-                delete=False
-            )
-            self.addCleanup(os.remove, schema_file.name)
-            schema = """
-                     {"type": "object", "properties": {"KEY1":
-                     {"$ref": %s%s#definitions/schemas"}},
-                     "definitions": {"schemas": {"type": "string"}}}
-                     """ % ("\"", os.path.basename(schema_file.name))
-            schema_file.write(schema)
-        finally:
-            schema_file.close()
-
-        self.assertOutputs(
-            files=dict(some_schema=schema, some_instance='{"KEY1": 1}'),
-            argv=["-i", "some_instance", "--base-uri", ".", "some_schema"],
-            exit_code=1,
-            stdout="",
-            stderr="1: 1 is not of type 'string'\n",
-        )
-
     def test_successful_validate_with_specifying_base_uri_absolute_path(self):
         absolute_path = os.getcwd()
         try: