Merge pull request #122 from encode/blueyed-abs

Support absolute database paths in sqlite URLs

Author: tomchristie

databases/core.py

@@ -362,7 +362,10 @@ def netloc(self) -> typing.Optional[str]:
 
     @property
     def database(self) -> str:
-        return self.components.path.lstrip("/")
+        path = self.components.path
+        if path.startswith("/"):
+            path = path[1:]
+        return path
 
     @property
     def options(self) -> dict:

tests/test_database_url.py

@@ -51,3 +51,9 @@ def test_replace_database_url_components():
     new = u.replace(database="test_" + u.database)
     assert new.database == "test_mydatabase"
     assert str(new) == "sqlite:///test_mydatabase"
+
+    u = DatabaseURL("sqlite:////absolute/path")
+    assert u.database == "/absolute/path"
+    new = u.replace(database=u.database + "_test")
+    assert new.database == "/absolute/path_test"
+    assert str(new) == "sqlite:////absolute/path_test"

tests/test_importer.py

@@ -4,28 +4,28 @@
 
 
 def test_invalid_format():
-    with pytest.raises(ImportFromStringError) as exc:
+    with pytest.raises(ImportFromStringError) as exc_info:
         import_from_string("example:")
     expected = 'Import string "example:" must be in format "<module>:<attribute>".'
-    assert expected in str(exc)
+    assert expected in str(exc_info.value)
 
 
 def test_invalid_module():
-    with pytest.raises(ImportFromStringError) as exc:
+    with pytest.raises(ImportFromStringError) as exc_info:
         import_from_string("module_does_not_exist:myattr")
     expected = 'Could not import module "module_does_not_exist".'
-    assert expected in str(exc)
+    assert expected in str(exc_info.value)
 
 
 def test_invalid_attr():
-    with pytest.raises(ImportFromStringError) as exc:
+    with pytest.raises(ImportFromStringError) as exc_info:
         import_from_string("tempfile:attr_does_not_exist")
     expected = 'Attribute "attr_does_not_exist" not found in module "tempfile".'
-    assert expected in str(exc)
+    assert expected in str(exc_info.value)
 
 
 def test_internal_import_error():
-    with pytest.raises(ImportError) as exc:
+    with pytest.raises(ImportError):
         import_from_string("tests.importer.raise_import_error:myattr")