Skip to content

Commit 71d4713

Browse files
committed
remove dead code
1 parent ee005f1 commit 71d4713

File tree

2 files changed

+2
-21
lines changed

2 files changed

+2
-21
lines changed

tests/conftest.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -143,20 +143,3 @@ def create_app_file(code, filename):
143143
)
144144

145145
return testdir
146-
147-
148-
@pytest.fixture
149-
def django_testdir_initial(django_testdir):
150-
"""A django_testdir fixture which provides initial_data."""
151-
django_testdir.project_root.join("tpkg/app/migrations").remove()
152-
django_testdir.makefile(
153-
".json",
154-
initial_data="""
155-
[{
156-
"pk": 1,
157-
"model": "app.item",
158-
"fields": { "name": "mark_initial_data" }
159-
}]""",
160-
)
161-
162-
return django_testdir

tests/test_urls.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@
55

66
@pytest.mark.urls("pytest_django_test.urls_overridden")
77
def test_urls():
8-
try:
9-
from django.urls import is_valid_path
10-
except ImportError:
11-
from django.core.urlresolvers import is_valid_path
8+
from django.urls import is_valid_path
9+
1210
assert settings.ROOT_URLCONF == "pytest_django_test.urls_overridden"
1311
assert is_valid_path("/overridden_url/")
1412

0 commit comments

Comments
 (0)