p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed a DeprecationWarning under Python 3.

This commit is contained in:
Aymeric Augustin 2012-10-23 21:34:58 +02:00
parent c736a1a9f8
commit 83041ca802
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/modeltests/delete/tests.py
View File

@ -250,7 +250,7 @@ class DeletionTests(TestCase):
self.assertNumQueries(3, a.delete) self.assertNumQueries(3, a.delete)
self.assertFalse(User.objects.exists()) self.assertFalse(User.objects.exists())
self.assertFalse(Avatar.objects.exists()) self.assertFalse(Avatar.objects.exists())
self.assertEquals(len(calls), 1) self.assertEqual(len(calls), 1)
models.signals.post_delete.disconnect(noop, sender=User) models.signals.post_delete.disconnect(noop, sender=User)
@skipIfDBFeature("can_defer_constraint_checks") @skipIfDBFeature("can_defer_constraint_checks")
@ -275,7 +275,7 @@ class DeletionTests(TestCase):
self.assertNumQueries(4, a.delete) self.assertNumQueries(4, a.delete)
self.assertFalse(User.objects.exists()) self.assertFalse(User.objects.exists())
self.assertFalse(Avatar.objects.exists()) self.assertFalse(Avatar.objects.exists())
self.assertEquals(len(calls), 1) self.assertEqual(len(calls), 1)
models.signals.post_delete.disconnect(noop, sender=User) models.signals.post_delete.disconnect(noop, sender=User)
def test_hidden_related(self): def test_hidden_related(self):
@ -317,7 +317,7 @@ class FastDeleteTests(TestCase):
u1 = User.objects.create() u1 = User.objects.create()
u2 = User.objects.create() u2 = User.objects.create()
self.assertNumQueries(1, User.objects.filter(pk=u1.pk).delete) self.assertNumQueries(1, User.objects.filter(pk=u1.pk).delete)
self.assertEquals(User.objects.count(), 1) self.assertEqual(User.objects.count(), 1)
self.assertTrue(User.objects.filter(pk=u2.pk).exists()) self.assertTrue(User.objects.filter(pk=u2.pk).exists())
def test_fast_delete_joined_qs(self): def test_fast_delete_joined_qs(self):
@ -327,7 +327,7 @@ class FastDeleteTests(TestCase):
expected_queries = 1 if connection.features.update_can_self_select else 2 expected_queries = 1 if connection.features.update_can_self_select else 2
self.assertNumQueries(expected_queries, self.assertNumQueries(expected_queries,
User.objects.filter(avatar__desc='a').delete) User.objects.filter(avatar__desc='a').delete)
self.assertEquals(User.objects.count(), 1) self.assertEqual(User.objects.count(), 1)
self.assertTrue(User.objects.filter(pk=u2.pk).exists()) self.assertTrue(User.objects.filter(pk=u2.pk).exists())
def test_fast_delete_inheritance(self): def test_fast_delete_inheritance(self):
@ -340,8 +340,8 @@ class FastDeleteTests(TestCase):
# self.assertNumQueries(2, c.delete) # self.assertNumQueries(2, c.delete)
c.delete() c.delete()
self.assertFalse(Child.objects.exists()) self.assertFalse(Child.objects.exists())
self.assertEquals(Parent.objects.count(), 1) self.assertEqual(Parent.objects.count(), 1)
self.assertEquals(Parent.objects.filter(pk=p.pk).count(), 1) self.assertEqual(Parent.objects.filter(pk=p.pk).count(), 1)
# 1 for self delete, 1 for fast delete of empty "child" qs. # 1 for self delete, 1 for fast delete of empty "child" qs.
self.assertNumQueries(2, p.delete) self.assertNumQueries(2, p.delete)
self.assertFalse(Parent.objects.exists()) self.assertFalse(Parent.objects.exists())