Convert much of the regression tests to use absolute imports. There's still work to be done though.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16976 bcc190cf-cafb-0310-a4f2-bffc1f526a37

11 files changed, 27 insertions, 9 deletions

diff --git a/tests/regressiontests/admin_scripts/app_with_import/models.py b/tests/regressiontests/admin_scripts/app_with_import/models.py
index 06ca0e8a34..17a892bd17 100644
--- a/tests/regressiontests/admin_scripts/app_with_import/models.py
+++ b/tests/regressiontests/admin_scripts/app_with_import/models.py
@@ -1,5 +1,6 @@
-from django.contrib.comments.models import Comment
 from django.db import models
+from django.contrib.comments.models import Comment
+
 
 # Regression for #13368. This is an example of a model
 # that imports a class that has an abstract base class.
diff --git a/tests/regressiontests/admin_scripts/complex_app/admin/foo.py b/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
index 1b933d028d..1ed704a66b 100644
--- a/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
+++ b/tests/regressiontests/admin_scripts/complex_app/admin/foo.py
@@ -1,3 +1,8 @@
+from __future__ import absolute_import
+
 from django.contrib import admin
-from admin_scripts.complex_app.models.foo import Foo
+
+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
index a4d6d9539a..7b647e74b1 100644
--- a/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
+++ b/tests/regressiontests/admin_scripts/complex_app/models/__init__.py
@@ -1,4 +1,4 @@
-from admin_scripts.complex_app.models.bar import Bar
-from admin_scripts.complex_app.models.foo import Foo
+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
index a5d8853fe4..15956f7a50 100644
--- a/tests/regressiontests/admin_scripts/complex_app/models/bar.py
+++ b/tests/regressiontests/admin_scripts/complex_app/models/bar.py
@@ -1,6 +1,10 @@
+from __future__ import absolute_import
+
 from django.db import models
 
-from admin_scripts.complex_app.admin import foo
+from ..admin import foo
+
+
 class Bar(models.Model):
     name = models.CharField(max_length=5)
     class Meta:
diff --git a/tests/regressiontests/admin_scripts/complex_app/models/foo.py b/tests/regressiontests/admin_scripts/complex_app/models/foo.py
index 70c285e392..914cf3b8b5 100644
--- a/tests/regressiontests/admin_scripts/complex_app/models/foo.py
+++ b/tests/regressiontests/admin_scripts/complex_app/models/foo.py
@@ -1,5 +1,6 @@
 from django.db import models
 
+
 class Foo(models.Model):
     name = models.CharField(max_length=5)
     class Meta:
diff --git a/tests/regressiontests/admin_scripts/management/commands/app_command.py b/tests/regressiontests/admin_scripts/management/commands/app_command.py
index f72e912ac0..6adab6eafd 100644
--- a/tests/regressiontests/admin_scripts/management/commands/app_command.py
+++ b/tests/regressiontests/admin_scripts/management/commands/app_command.py
@@ -1,5 +1,6 @@
 from django.core.management.base import AppCommand
 
+
 class Command(AppCommand):
     help = 'Test Application-based commands'
     requires_model_validation = False
@@ -7,4 +8,4 @@ class Command(AppCommand):
 
     def handle_app(self, app, **options):
         print 'EXECUTE:AppCommand app=%s, options=%s' % (app, sorted(options.items()))
-        
+
diff --git a/tests/regressiontests/admin_scripts/management/commands/base_command.py b/tests/regressiontests/admin_scripts/management/commands/base_command.py
index 438f7038ca..05fbcbc9c3 100644
--- a/tests/regressiontests/admin_scripts/management/commands/base_command.py
+++ b/tests/regressiontests/admin_scripts/management/commands/base_command.py
@@ -1,6 +1,8 @@
-from django.core.management.base import BaseCommand
 from optparse import make_option
 
+from django.core.management.base import BaseCommand
+
+
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
         make_option('--option_a','-a', action='store', dest='option_a', default='1'),
diff --git a/tests/regressiontests/admin_scripts/management/commands/label_command.py b/tests/regressiontests/admin_scripts/management/commands/label_command.py
index 2b735c8e60..74cbd6991d 100644
--- a/tests/regressiontests/admin_scripts/management/commands/label_command.py
+++ b/tests/regressiontests/admin_scripts/management/commands/label_command.py
@@ -1,5 +1,6 @@
 from django.core.management.base import LabelCommand
 
+
 class Command(LabelCommand):
     help = "Test Label-based commands"
     requires_model_validation = False
diff --git a/tests/regressiontests/admin_scripts/management/commands/noargs_command.py b/tests/regressiontests/admin_scripts/management/commands/noargs_command.py
index 683eb7a62c..0c272963b1 100644
--- a/tests/regressiontests/admin_scripts/management/commands/noargs_command.py
+++ b/tests/regressiontests/admin_scripts/management/commands/noargs_command.py
@@ -1,5 +1,6 @@
 from django.core.management.base import NoArgsCommand
 
+
 class Command(NoArgsCommand):
     help = "Test No-args commands"
     requires_model_validation = False
diff --git a/tests/regressiontests/admin_scripts/models.py b/tests/regressiontests/admin_scripts/models.py
index 96a40d22b7..da803d0174 100644
--- a/tests/regressiontests/admin_scripts/models.py
+++ b/tests/regressiontests/admin_scripts/models.py
@@ -1,5 +1,6 @@
 from django.db import models
 
+
 class Article(models.Model):
     headline = models.CharField(max_length=100, default='Default headline')
     pub_date = models.DateTimeField()
@@ -9,4 +10,3 @@ class Article(models.Model):
 
     class Meta:
         ordering = ('-pub_date', 'headline')
-        
\ No newline at end of file
diff --git a/tests/regressiontests/admin_scripts/simple_app/models.py b/tests/regressiontests/admin_scripts/simple_app/models.py
index 65b30ed38a..b89f4b898b 100644
--- a/tests/regressiontests/admin_scripts/simple_app/models.py
+++ b/tests/regressiontests/admin_scripts/simple_app/models.py
@@ -1 +1,3 @@
-from admin_scripts.complex_app.models.bar import Bar
+from __future__ import absolute_import
+
+from ..complex_app.models.bar import Bar