From d613a814d3ceca3fb0f677aa36c328ef37249cff Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 2 Jun 2023 19:48:31 +0200 Subject: [PATCH] vcr/unittest: Simplify file layout .. and make "from vcr.unittest import VCRTestCase" work again. --- docs/usage.rst | 2 +- .../tests/test_testcase.py => tests/unit/test_unittest.py | 2 +- vcr/{unittest/testcase.py => unittest.py} | 2 +- vcr/unittest/__init__.py | 0 vcr/unittest/tests/__init__.py | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename vcr/unittest/tests/test_testcase.py => tests/unit/test_unittest.py (99%) rename vcr/{unittest/testcase.py => unittest.py} (97%) delete mode 100644 vcr/unittest/__init__.py delete mode 100644 vcr/unittest/tests/__init__.py diff --git a/docs/usage.rst b/docs/usage.rst index 990868d..4c257cc 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -132,7 +132,7 @@ you can hook on ``_get_vcr``, for example: See `the source -`__ +`__ for the default implementations of these methods. If you implement a ``setUp`` method on your test class then make sure to call diff --git a/vcr/unittest/tests/test_testcase.py b/tests/unit/test_unittest.py similarity index 99% rename from vcr/unittest/tests/test_testcase.py rename to tests/unit/test_unittest.py index 11a6aa7..705cb86 100644 --- a/vcr/unittest/tests/test_testcase.py +++ b/tests/unit/test_unittest.py @@ -3,7 +3,7 @@ from unittest import TextTestRunner, defaultTestLoader from unittest.mock import MagicMock from urllib.request import urlopen -from ..testcase import VCRTestCase +from vcr.unittest import VCRTestCase def test_defaults(): diff --git a/vcr/unittest/testcase.py b/vcr/unittest.py similarity index 97% rename from vcr/unittest/testcase.py rename to vcr/unittest.py index f44629a..2843328 100644 --- a/vcr/unittest/testcase.py +++ b/vcr/unittest.py @@ -2,7 +2,7 @@ import inspect import os import unittest -from .. import VCR +from .config import VCR class VCRMixin: diff --git a/vcr/unittest/__init__.py b/vcr/unittest/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/vcr/unittest/tests/__init__.py b/vcr/unittest/tests/__init__.py deleted file mode 100644 index e69de29..0000000