From f1bba1369b7bd3836fd6e38cf1a3c4d7844feee5 Mon Sep 17 00:00:00 2001 From: Tomasz Kramkowski Date: Mon, 27 Mar 2023 23:09:25 +0100 Subject: rename open_database to open_store --- paste/__init__.py | 4 ++-- tests/middleware/test_open_database.py | 31 ------------------------------- tests/middleware/test_open_store.py | 31 +++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 tests/middleware/test_open_database.py create mode 100644 tests/middleware/test_open_store.py diff --git a/paste/__init__.py b/paste/__init__.py index 0f75587..099474a 100644 --- a/paste/__init__.py +++ b/paste/__init__.py @@ -151,7 +151,7 @@ def options(app: App, environ: Env, start_response: StartResponse) -> Response: @middleware -def open_database(app: App, environ: Env, start_response: StartResponse) -> Response: +def open_store(app: App, environ: Env, start_response: StartResponse) -> Response: db_path = environ.get("PASTE_DB", DB_PATH) with store.open(db_path) as stor: environ["paste.store"] = stor @@ -186,7 +186,7 @@ def authenticate(app: App, environ: Env, start_response: StartResponse) -> Respo @validate_method @options @if_none_match -@open_database +@open_store @authenticate def application(environ: Env, start_response: StartResponse) -> Response: stor = environ["paste.store"] diff --git a/tests/middleware/test_open_database.py b/tests/middleware/test_open_database.py deleted file mode 100644 index 769c04e..0000000 --- a/tests/middleware/test_open_database.py +++ /dev/null @@ -1,31 +0,0 @@ -from contextlib import contextmanager -from wsgiref.validate import validator - -from paste import open_database - -from ..common_wsgi import call_app - - -def test_open_database(monkeypatch): - db_path = "test_db_path" - store = object() - - @contextmanager - def store_open(path): - assert path == db_path - yield store - - @validator - @open_database - @validator - def app(environ, start_response): - assert "paste.store" in environ - assert environ["paste.store"] == store - start_response("200 OK", [("Content-Type", "text/plain")]) - return [b"Hello, World!"] - - monkeypatch.setattr("paste.store.open", store_open) - response = call_app(app, environ={"PASTE_DB": db_path}) - assert response.status == "200 OK" - assert response.data == b"Hello, World!" - assert ("Content-Type", "text/plain") in response.headers diff --git a/tests/middleware/test_open_store.py b/tests/middleware/test_open_store.py new file mode 100644 index 0000000..dd430e9 --- /dev/null +++ b/tests/middleware/test_open_store.py @@ -0,0 +1,31 @@ +from contextlib import contextmanager +from wsgiref.validate import validator + +from paste import open_store + +from ..common_wsgi import call_app + + +def test_open_store(monkeypatch): + db_path = "test_db_path" + store = object() + + @contextmanager + def store_open(path): + assert path == db_path + yield store + + @validator + @open_store + @validator + def app(environ, start_response): + assert "paste.store" in environ + assert environ["paste.store"] == store + start_response("200 OK", [("Content-Type", "text/plain")]) + return [b"Hello, World!"] + + monkeypatch.setattr("paste.store.open", store_open) + response = call_app(app, environ={"PASTE_DB": db_path}) + assert response.status == "200 OK" + assert response.data == b"Hello, World!" + assert ("Content-Type", "text/plain") in response.headers -- cgit v1.2.3-54-g00ecf