Skip to content

Commit

Permalink
Remove a handful of import * from the tests.
Browse files Browse the repository at this point in the history
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
alex committed Oct 13, 2011
1 parent 406f9d1 commit 43920cd
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 22 deletions.
15 changes: 8 additions & 7 deletions tests/modeltests/mutually_referential/models.py
Expand Up @@ -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")
3 changes: 2 additions & 1 deletion 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)),
)
Expand Down
18 changes: 9 additions & 9 deletions 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
Expand Down Expand Up @@ -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 = {}
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion tests/regressiontests/forms/tests/error_messages.py
Expand Up @@ -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:
Expand All @@ -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 = {
Expand Down
7 changes: 4 additions & 3 deletions 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.
Expand Down
3 changes: 2 additions & 1 deletion tests/regressiontests/utils/datastructures.py
Expand Up @@ -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):
Expand Down

0 comments on commit 43920cd

Please sign in to comment.