From 43920cd32e24eb293b445028c7710b42f9abc7c4 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 13 Oct 2011 12:53:02 +0000 Subject: [PATCH] Remove a handful of `import *` from the tests. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16973 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../modeltests/mutually_referential/models.py | 15 ++++++++------- .../regressiontests/admin_custom_urls/urls.py | 3 ++- .../dispatch/tests/test_saferef.py | 18 +++++++++--------- .../forms/tests/error_messages.py | 3 ++- tests/regressiontests/text/tests.py | 7 ++++--- tests/regressiontests/utils/datastructures.py | 3 ++- 6 files changed, 27 insertions(+), 22 deletions(-) diff --git a/tests/modeltests/mutually_referential/models.py b/tests/modeltests/mutually_referential/models.py index db05cbc8a3..0f1bd65cb1 100644 --- a/tests/modeltests/mutually_referential/models.py +++ b/tests/modeltests/mutually_referential/models.py @@ -4,16 +4,17 @@ Strings can be used instead of model literals to set up "lazy" relations. """ -from django.db.models import * +from django.db import models -class Parent(Model): - name = CharField(max_length=100) + +class Parent(models.Model): + name = models.CharField(max_length=100) # Use a simple string for forward declarations. - bestchild = ForeignKey("Child", null=True, related_name="favoured_by") + bestchild = models.ForeignKey("Child", null=True, related_name="favoured_by") -class Child(Model): - name = CharField(max_length=100) +class Child(models.Model): + name = models.CharField(max_length=100) # You can also explicitally specify the related app. - parent = ForeignKey("mutually_referential.Parent") + parent = models.ForeignKey("mutually_referential.Parent") diff --git a/tests/regressiontests/admin_custom_urls/urls.py b/tests/regressiontests/admin_custom_urls/urls.py index 6c2761a222..478390737d 100644 --- a/tests/regressiontests/admin_custom_urls/urls.py +++ b/tests/regressiontests/admin_custom_urls/urls.py @@ -1,6 +1,7 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, include from django.contrib import admin + urlpatterns = patterns('', (r'^admin/', include(admin.site.urls)), ) diff --git a/tests/regressiontests/dispatch/tests/test_saferef.py b/tests/regressiontests/dispatch/tests/test_saferef.py index c8cfd6cce1..fecded69a5 100644 --- a/tests/regressiontests/dispatch/tests/test_saferef.py +++ b/tests/regressiontests/dispatch/tests/test_saferef.py @@ -1,7 +1,7 @@ -from django.dispatch.saferef import * - +from django.dispatch.saferef import safeRef from django.utils import unittest + class Test1(object): def x(self): pass @@ -32,21 +32,21 @@ class Tester(unittest.TestCase): self.ts = ts self.ss = ss self.closureCount = 0 - + def tearDown(self): del self.ts del self.ss - + def testIn(self): """Test the "in" operator for safe references (cmp)""" for t in self.ts[:50]: self.assertTrue(safeRef(t.x) in self.ss) - + def testValid(self): """Test that the references are valid (return instance methods)""" for s in self.ss: self.assertTrue(s()) - + def testShortCircuit (self): """Test that creation short-circuits to reuse existing references""" sd = {} @@ -59,15 +59,15 @@ class Tester(unittest.TestCase): else: self.assertTrue(sd.has_key(safeRef(t))) self.assertTrue(safeRef(t) in sd) - + def testRepresentation (self): """Test that the reference object's representation works - + XXX Doesn't currently check the results, just that no error is raised """ repr(self.ss[-1]) - + def _closure(self, ref): """Dumb utility mechanism to increment deletion counter""" self.closureCount +=1 diff --git a/tests/regressiontests/forms/tests/error_messages.py b/tests/regressiontests/forms/tests/error_messages.py index 93f35704ed..c54a46331b 100644 --- a/tests/regressiontests/forms/tests/error_messages.py +++ b/tests/regressiontests/forms/tests/error_messages.py @@ -4,8 +4,10 @@ from django.forms import * from django.test import TestCase from django.utils.safestring import mark_safe from django.utils import unittest + from regressiontests.forms.tests.fields import verify_exists_urls + class AssertFormErrorsMixin(object): def assertFormErrors(self, expected, the_callable, *args, **kwargs): try: @@ -14,7 +16,6 @@ class AssertFormErrorsMixin(object): except ValidationError, e: self.assertEqual(e.messages, expected) - class FormsErrorMessagesTestCase(unittest.TestCase, AssertFormErrorsMixin): def test_charfield(self): e = { diff --git a/tests/regressiontests/text/tests.py b/tests/regressiontests/text/tests.py index 4d8b674924..ac10a0162e 100644 --- a/tests/regressiontests/text/tests.py +++ b/tests/regressiontests/text/tests.py @@ -1,12 +1,13 @@ # coding: utf-8 from __future__ import with_statement -from django.test import TestCase -from django.utils.text import * -from django.utils.http import urlquote, urlquote_plus, cookie_date, http_date +from django.test import TestCase from django.utils.encoding import iri_to_uri +from django.utils.http import urlquote, urlquote_plus, cookie_date, http_date +from django.utils.text import get_text_list, smart_split from django.utils.translation import override + class TextTests(TestCase): """ Tests for stuff in django.utils.text and other text munging util functions. diff --git a/tests/regressiontests/utils/datastructures.py b/tests/regressiontests/utils/datastructures.py index d86a3c8fb8..aaac9ba477 100644 --- a/tests/regressiontests/utils/datastructures.py +++ b/tests/regressiontests/utils/datastructures.py @@ -6,7 +6,8 @@ import copy import pickle from django.test import SimpleTestCase -from django.utils.datastructures import * +from django.utils.datastructures import (DictWrapper, DotExpandedDict, + ImmutableList, MultiValueDict, MultiValueDictKeyError, MergeDict, SortedDict) class SortedDictTests(SimpleTestCase):