From 588a510c81d937d5f27a0000a001edb077e674a9 Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Thu, 3 Sep 2020 09:55:20 +0200 Subject: [PATCH] Revert workaround for not optional django.test.utils.setup_databases()'s time_keeper. time_keeper is optional since https://github.com/django/django/commit/0b8871ab6744285943784795ede053839ee009ef This reverts ed04bb0613fb14885efe939d38a7d6ae23a12435. --- pytest_django/compat.py | 35 ++++------------------------------- 1 file changed, 4 insertions(+), 31 deletions(-) diff --git a/pytest_django/compat.py b/pytest_django/compat.py index edb73d6dd..97a847c24 100644 --- a/pytest_django/compat.py +++ b/pytest_django/compat.py @@ -1,29 +1,8 @@ # This file cannot be imported from until Django sets up - - -def _get_setup_and_teardown_databases(): - try: - # Django 3.2+ has added timing capabilities that we don't really support - # right now. Unfortunately that new time_keeper is required. - from django.test.utils import NullTimeKeeper - except ImportError: - pass - else: - from django.test.utils import setup_databases, teardown_databases - - def wrapped_setup_databases(*args, **kwargs): - return setup_databases(*args, time_keeper=NullTimeKeeper(), **kwargs) - - return wrapped_setup_databases, teardown_databases - - try: - # Django 1.11+ - from django.test.utils import setup_databases, teardown_databases # noqa: F401, F811 - except ImportError: - pass - else: - return setup_databases, teardown_databases - +try: + # Django 1.11+ + from django.test.utils import setup_databases, teardown_databases # noqa: F401, F811 +except ImportError: # In Django prior to 1.11, teardown_databases is only available as a method on DiscoverRunner from django.test.runner import setup_databases, DiscoverRunner # noqa: F401, F811 @@ -31,9 +10,3 @@ def teardown_databases(db_cfg, verbosity): DiscoverRunner(verbosity=verbosity, interactive=False).teardown_databases( db_cfg ) - - return setup_databases, teardown_databases - - -setup_databases, teardown_databases = _get_setup_and_teardown_databases() -del _get_setup_and_teardown_databases