diff --git a/datasette/utils/__init__.py b/datasette/utils/__init__.py index bdeb6e5a..6eefc2dc 100644 --- a/datasette/utils/__init__.py +++ b/datasette/utils/__init__.py @@ -878,7 +878,7 @@ class LoadExtension(click.ParamType): path_entry = value.split(":", 2) if len(path_entry) < 3: return value - #argument contains a Windows/DOS path and an entry point + # argument contains a Windows/DOS path and an entry point path = path_entry[0] + ":" + path_entry[1] entrypoint = path_entry[-1] return path, entrypoint diff --git a/tests/test_loadextension.py b/tests/test_loadextension.py index c5b3fca4..3ceb372e 100644 --- a/tests/test_loadextension.py +++ b/tests/test_loadextension.py @@ -1,28 +1,31 @@ from datasette.utils import LoadExtension + def test_dos_path(): path_string = "C:\Windows\System32\mod_spatialite.dll" le = LoadExtension() path = le.convert(path_string, None, None) assert path == "C:\Windows\System32\mod_spatialite.dll" - + + def test_dos_pathentry(): path_entry = "C:\Windows\System32\mod_spatialite.dll:testentry" le = LoadExtension() pathen, entry = le.convert(path_entry, None, None) assert pathen == "C:\Windows\System32\mod_spatialite.dll" assert entry == "testentry" - + + def test_linux_path(): path_string = "/base/test/test2" le = LoadExtension() path = le.convert(path_string, None, None) assert path == path_string + def test_linux_path_entry(): path_string = "/base/test/test2:testentry" le = LoadExtension() path, entry = le.convert(path_string, None, None) assert path == "/base/test/test2" assert entry == "testentry" - \ No newline at end of file