Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove a handful of `import *` from the tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 43920cd32e24eb293b445028c7710b42f9abc7c4 1 parent 406f9d1
@alex alex authored
View
15 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")
View
3  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)),
)
View
18 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 @@ def setUp(self):
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 @@ def testShortCircuit (self):
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
View
3  tests/regressiontests/forms/tests/error_messages.py
@@ -4,8 +4,10 @@
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 @@ def assertFormErrors(self, expected, the_callable, *args, **kwargs):
except ValidationError, e:
self.assertEqual(e.messages, expected)
-
class FormsErrorMessagesTestCase(unittest.TestCase, AssertFormErrorsMixin):
def test_charfield(self):
e = {
View
7 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.
View
3  tests/regressiontests/utils/datastructures.py
@@ -6,7 +6,8 @@
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):

0 comments on commit 43920cd

Please sign in to comment.
Something went wrong with that request. Please try again.