From 89f40e36246100df6a11316c31a76712ebc6c501 Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Tue, 26 Feb 2013 09:53:47 +0100 Subject: Merged regressiontests and modeltests into the test root. --- tests/regressiontests/admin_scripts/complex_app/__init__.py | 0 .../admin_scripts/complex_app/admin/__init__.py | 0 tests/regressiontests/admin_scripts/complex_app/admin/foo.py | 8 -------- .../admin_scripts/complex_app/models/__init__.py | 4 ---- tests/regressiontests/admin_scripts/complex_app/models/bar.py | 11 ----------- tests/regressiontests/admin_scripts/complex_app/models/foo.py | 7 ------- 6 files changed, 30 deletions(-) delete mode 100644 tests/regressiontests/admin_scripts/complex_app/__init__.py delete mode 100644 tests/regressiontests/admin_scripts/complex_app/admin/__init__.py delete mode 100644 tests/regressiontests/admin_scripts/complex_app/admin/foo.py delete mode 100644 tests/regressiontests/admin_scripts/complex_app/models/__init__.py delete mode 100644 tests/regressiontests/admin_scripts/complex_app/models/bar.py delete mode 100644 tests/regressiontests/admin_scripts/complex_app/models/foo.py (limited to 'tests/regressiontests/admin_scripts/complex_app') diff --git a/tests/regressiontests/admin_scripts/complex_app/__init__.py b/tests/regressiontests/admin_scripts/complex_app/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py b/tests/regressiontests/admin_scripts/complex_app/admin/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/regressiontests/admin_scripts/complex_app/admin/foo.py b/tests/regressiontests/admin_scripts/complex_app/admin/foo.py deleted file mode 100644 index 1ed704a66b..0000000000 --- a/tests/regressiontests/admin_scripts/complex_app/admin/foo.py +++ /dev/null @@ -1,8 +0,0 @@ -from __future__ import absolute_import - -from django.contrib import admin - -from ..models.foo import Foo - - -admin.site.register(Foo) diff --git a/tests/regressiontests/admin_scripts/complex_app/models/__init__.py b/tests/regressiontests/admin_scripts/complex_app/models/__init__.py deleted file mode 100644 index 7b647e74b1..0000000000 --- a/tests/regressiontests/admin_scripts/complex_app/models/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -from .bar import Bar -from .foo import Foo - -__all__ = ['Foo', 'Bar'] diff --git a/tests/regressiontests/admin_scripts/complex_app/models/bar.py b/tests/regressiontests/admin_scripts/complex_app/models/bar.py deleted file mode 100644 index 15956f7a50..0000000000 --- a/tests/regressiontests/admin_scripts/complex_app/models/bar.py +++ /dev/null @@ -1,11 +0,0 @@ -from __future__ import absolute_import - -from django.db import models - -from ..admin import foo - - -class Bar(models.Model): - name = models.CharField(max_length=5) - class Meta: - app_label = 'complex_app' diff --git a/tests/regressiontests/admin_scripts/complex_app/models/foo.py b/tests/regressiontests/admin_scripts/complex_app/models/foo.py deleted file mode 100644 index 914cf3b8b5..0000000000 --- a/tests/regressiontests/admin_scripts/complex_app/models/foo.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.db import models - - -class Foo(models.Model): - name = models.CharField(max_length=5) - class Meta: - app_label = 'complex_app' -- cgit v1.3