diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2011-10-13 18:51:33 +0000 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2011-10-13 18:51:33 +0000 |
| commit | d362c1546f8ad62811e5dee3cf0b43170e6e1c4c (patch) | |
| tree | c14af91e991cb534a135cc0ca467aa6263007b07 /tests/regressiontests/forms | |
| parent | d5a45d79fe03cad93ab5761860e9bb6fc1db4c86 (diff) | |
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
Diffstat (limited to 'tests/regressiontests/forms')
| -rw-r--r-- | tests/regressiontests/forms/models.py | 2 | ||||
| -rw-r--r-- | tests/regressiontests/forms/tests/__init__.py | 26 | ||||
| -rw-r--r-- | tests/regressiontests/forms/tests/error_messages.py | 7 | ||||
| -rw-r--r-- | tests/regressiontests/forms/tests/extra.py | 13 | ||||
| -rw-r--r-- | tests/regressiontests/forms/tests/forms.py | 1 | ||||
| -rw-r--r-- | tests/regressiontests/forms/tests/media.py | 2 | ||||
| -rw-r--r-- | tests/regressiontests/forms/tests/models.py | 8 | ||||
| -rw-r--r-- | tests/regressiontests/forms/tests/widgets.py | 1 |
8 files changed, 37 insertions, 23 deletions
diff --git a/tests/regressiontests/forms/models.py b/tests/regressiontests/forms/models.py index 203980c11c..d4e693436b 100644 --- a/tests/regressiontests/forms/models.py +++ b/tests/regressiontests/forms/models.py @@ -2,8 +2,8 @@ import datetime import tempfile -from django.db import models from django.core.files.storage import FileSystemStorage +from django.db import models temp_storage_location = tempfile.mkdtemp() diff --git a/tests/regressiontests/forms/tests/__init__.py b/tests/regressiontests/forms/tests/__init__.py index 1b615c4583..721926ec20 100644 --- a/tests/regressiontests/forms/tests/__init__.py +++ b/tests/regressiontests/forms/tests/__init__.py @@ -1,12 +1,14 @@ -from error_messages import * -from extra import * -from fields import FieldsTests -from forms import * -from formsets import * -from input_formats import * -from media import * -from models import * -from regressions import * -from util import * -from validators import TestFieldWithValidators -from widgets import * +from __future__ import absolute_import + +from .error_messages import * +from .extra import * +from .fields import FieldsTests +from .forms import * +from .formsets import * +from .input_formats import * +from .media import * +from .models import * +from .regressions import * +from .util import * +from .validators import TestFieldWithValidators +from .widgets import * diff --git a/tests/regressiontests/forms/tests/error_messages.py b/tests/regressiontests/forms/tests/error_messages.py index c54a46331b..1c262d683d 100644 --- a/tests/regressiontests/forms/tests/error_messages.py +++ b/tests/regressiontests/forms/tests/error_messages.py @@ -1,11 +1,14 @@ # -*- coding: utf-8 -*- + +from __future__ import absolute_import + from django.core.files.uploadedfile import SimpleUploadedFile from django.forms import * from django.test import TestCase -from django.utils.safestring import mark_safe from django.utils import unittest +from django.utils.safestring import mark_safe -from regressiontests.forms.tests.fields import verify_exists_urls +from .fields import verify_exists_urls class AssertFormErrorsMixin(object): diff --git a/tests/regressiontests/forms/tests/extra.py b/tests/regressiontests/forms/tests/extra.py index 67a5ffc7b1..dec97240e0 100644 --- a/tests/regressiontests/forms/tests/extra.py +++ b/tests/regressiontests/forms/tests/extra.py @@ -1,15 +1,18 @@ # -*- coding: utf-8 -*- + +from __future__ import absolute_import + import datetime from django.conf import settings from django.forms import * from django.forms.extras import SelectDateWidget from django.forms.util import ErrorList -from django.utils import translation -from django.utils import unittest -from django.utils.encoding import force_unicode -from django.utils.encoding import smart_unicode -from error_messages import AssertFormErrorsMixin +from django.utils import translation, unittest +from django.utils.encoding import force_unicode, smart_unicode + +from .error_messages import AssertFormErrorsMixin + class GetDate(Form): mydate = DateField(widget=SelectDateWidget) diff --git a/tests/regressiontests/forms/tests/forms.py b/tests/regressiontests/forms/tests/forms.py index ed783af819..91db44949c 100644 --- a/tests/regressiontests/forms/tests/forms.py +++ b/tests/regressiontests/forms/tests/forms.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- import datetime + from django.core.files.uploadedfile import SimpleUploadedFile from django.forms import * from django.http import QueryDict diff --git a/tests/regressiontests/forms/tests/media.py b/tests/regressiontests/forms/tests/media.py index 71dc0a7b03..69c0af920c 100644 --- a/tests/regressiontests/forms/tests/media.py +++ b/tests/regressiontests/forms/tests/media.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from django.forms import TextInput, Media, TextInput, CharField, Form, MultiWidget +from django.template import Template, Context from django.test import TestCase from django.test.utils import override_settings -from django.template import Template, Context class FormsMediaTestCase(TestCase): diff --git a/tests/regressiontests/forms/tests/models.py b/tests/regressiontests/forms/tests/models.py index 60fc4e83ba..89b33097ea 100644 --- a/tests/regressiontests/forms/tests/models.py +++ b/tests/regressiontests/forms/tests/models.py @@ -1,12 +1,16 @@ # -*- coding: utf-8 -*- +from __future__ import absolute_import + import datetime + from django.core.files.uploadedfile import SimpleUploadedFile from django.db import models from django.forms import Form, ModelForm, FileField, ModelChoiceField from django.forms.models import ModelFormMetaclass from django.test import TestCase -from regressiontests.forms.models import (ChoiceOptionModel, ChoiceFieldModel, - FileModel, Group, BoundaryModel, Defaults) + +from ..models import (ChoiceOptionModel, ChoiceFieldModel, FileModel, Group, + BoundaryModel, Defaults) class ChoiceFieldForm(ModelForm): diff --git a/tests/regressiontests/forms/tests/widgets.py b/tests/regressiontests/forms/tests/widgets.py index e6667f7629..2424bea903 100644 --- a/tests/regressiontests/forms/tests/widgets.py +++ b/tests/regressiontests/forms/tests/widgets.py @@ -2,6 +2,7 @@ import copy import datetime + from django.conf import settings from django.core.files.uploadedfile import SimpleUploadedFile from django.forms import * |
