Skip to content

D
django
Kaydet (Commit) f9389634 authored tarafından Tim Graham's avatar Tim Graham
Dosyalara gözat
Seçenekler

Fixed Python 3.2 syntax errors; refs #13724.

üst c39c9f2a
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
tests/multiple_database/tests.py
Dosyayı görüntüle @ f9389634
...@@ -1939,7 +1939,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -1939,7 +1939,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
pet.owner.delete() pet.owner.delete()
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Person) self.assertEqual(e.model, Person)
self.assertEqual(e.hints, {'instance': owner}) self.assertEqual(e.hints, {'instance': owner})
...@@ -1951,7 +1951,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -1951,7 +1951,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
to_del_qs.delete() to_del_qs.delete()
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Pet) self.assertEqual(e.model, Pet)
self.assertEqual(e.hints, {'instance': owner}) self.assertEqual(e.hints, {'instance': owner})
...@@ -1962,7 +1962,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -1962,7 +1962,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
owner.pet_set.get_or_create(name='fido') owner.pet_set.get_or_create(name='fido')
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Pet) self.assertEqual(e.model, Pet)
self.assertEqual(e.hints, {'instance': owner}) self.assertEqual(e.hints, {'instance': owner})
...@@ -1974,7 +1974,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -1974,7 +1974,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
owner.pet_set.update(name='max') owner.pet_set.update(name='max')
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Pet) self.assertEqual(e.model, Pet)
self.assertEqual(e.hints, {'instance': owner}) self.assertEqual(e.hints, {'instance': owner})
...@@ -1987,7 +1987,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -1987,7 +1987,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
book.authors.add(auth) book.authors.add(auth)
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Book.authors.through) self.assertEqual(e.model, Book.authors.through)
self.assertEqual(e.hints, {'instance': book}) self.assertEqual(e.hints, {'instance': book})
...@@ -2001,7 +2001,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -2001,7 +2001,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
book.authors.clear() book.authors.clear()
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Book.authors.through) self.assertEqual(e.model, Book.authors.through)
self.assertEqual(e.hints, {'instance': book}) self.assertEqual(e.hints, {'instance': book})
...@@ -2015,7 +2015,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -2015,7 +2015,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
book.authors.all().delete() book.authors.all().delete()
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Person) self.assertEqual(e.model, Person)
self.assertEqual(e.hints, {'instance': book}) self.assertEqual(e.hints, {'instance': book})
...@@ -2028,7 +2028,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -2028,7 +2028,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
book.authors.get_or_create(name='Someone else') book.authors.get_or_create(name='Someone else')
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Book) self.assertEqual(e.model, Book)
self.assertEqual(e.hints, {'instance': book}) self.assertEqual(e.hints, {'instance': book})
...@@ -2043,7 +2043,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -2043,7 +2043,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
book.authors.remove(auth) book.authors.remove(auth)
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Book.authors.through) self.assertEqual(e.model, Book.authors.through)
self.assertEqual(e.hints, {'instance': book}) self.assertEqual(e.hints, {'instance': book})
...@@ -2057,7 +2057,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -2057,7 +2057,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
book.authors.all().update(name='Different') book.authors.all().update(name='Different')
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Person) self.assertEqual(e.model, Person)
self.assertEqual(e.hints, {'instance': book}) self.assertEqual(e.hints, {'instance': book})
...@@ -2070,7 +2070,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -2070,7 +2070,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
auth.book_set.add(book) auth.book_set.add(book)
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Book.authors.through) self.assertEqual(e.model, Book.authors.through)
self.assertEqual(e.hints, {'instance': auth}) self.assertEqual(e.hints, {'instance': auth})
...@@ -2084,7 +2084,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -2084,7 +2084,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
auth.book_set.clear() auth.book_set.clear()
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Book.authors.through) self.assertEqual(e.model, Book.authors.through)
self.assertEqual(e.hints, {'instance': auth}) self.assertEqual(e.hints, {'instance': auth})
...@@ -2098,7 +2098,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -2098,7 +2098,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
auth.book_set.all().delete() auth.book_set.all().delete()
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Book) self.assertEqual(e.model, Book)
self.assertEqual(e.hints, {'instance': auth}) self.assertEqual(e.hints, {'instance': auth})
...@@ -2111,7 +2111,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -2111,7 +2111,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
auth.book_set.get_or_create(title="New Book", published=datetime.datetime.now()) auth.book_set.get_or_create(title="New Book", published=datetime.datetime.now())
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Person) self.assertEqual(e.model, Person)
self.assertEqual(e.hints, {'instance': auth}) self.assertEqual(e.hints, {'instance': auth})
...@@ -2125,7 +2125,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -2125,7 +2125,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
auth.book_set.remove(book) auth.book_set.remove(book)
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Book.authors.through) self.assertEqual(e.model, Book.authors.through)
self.assertEqual(e.hints, {'instance': auth}) self.assertEqual(e.hints, {'instance': auth})
...@@ -2139,7 +2139,7 @@ class RouteForWriteTestCase(TestCase): ...@@ -2139,7 +2139,7 @@ class RouteForWriteTestCase(TestCase):
try: try:
auth.book_set.all().update(title='Different') auth.book_set.all().update(title='Different')
self.fail('db_for_write() not invoked on router') self.fail('db_for_write() not invoked on router')
except RouterUsed, e: except RouterUsed as e:
self.assertEqual(e.mode, RouterUsed.WRITE) self.assertEqual(e.mode, RouterUsed.WRITE)
self.assertEqual(e.model, Book) self.assertEqual(e.model, Book)
self.assertEqual(e.hints, {'instance': auth}) self.assertEqual(e.hints, {'instance': auth})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment