Changeset 7944

Timestamp:

07/17/08 15:12:21 (4 months ago)

Author:

brosner

Message:

newforms-admin: Merged from trunk up to [7941].

Files:

• django/branches/newforms-admin (modified) (1 prop)
• django/branches/newforms-admin/django/db/models/query.py (modified) (1 diff)
• django/branches/newforms-admin/django/test/utils.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/admin_scripts/tests.py (modified) (1 diff)
• django/branches/newforms-admin/tests/regressiontests/queries/models.py (modified) (3 diffs)

django/branches/newforms-admin/django/db/models/query.py

@@ -281 +281 @@
-        integer.
-
-
-
-
-
-
+
+
+
+
-            return len(self._result_cache)
-

django/branches/newforms-admin/django/test/utils.py

@@ -75 +75 @@
-    "Make sure a connection is in autocommit mode."
-    if hasattr(connection.connection, "autocommit"):
-
+
+
+
+
-    elif hasattr(connection.connection, "set_isolation_level"):
-        connection.connection.set_isolation_level(0)

django/branches/newforms-admin/tests/regressiontests/admin_scripts/tests.py

@@ -109 +109 @@
-    def assertOutput(self, stream, msg):
-        "Utility assertion: assert that the given message exists in the output"
-assertTrue
+failUnless
-
-##########################################################################

django/branches/newforms-admin/tests/regressiontests/queries/models.py

@@ -5 +5 @@
-import datetime
-import pickle
+import sys
-
-from django.db import models
@@ -483 +484 @@
->>> Cover.objects.all()
-[<Cover: first>, <Cover: second>]
-
-# If you're not careful, it's possible to introduce infinite loops via default
-# ordering on foreign keys in a cycle. We detect that.
->>> LoopX.objects.all()
-Traceback (most recent call last):
-...
-FieldError: Infinite loop caused by ordering.
-
->>> LoopZ.objects.all()
-Traceback (most recent call last):
-...
-FieldError: Infinite loop caused by ordering.
-
-# ... but you can still order in a non-recursive fashion amongst linked fields
-# (the previous test failed because the default ordering was recursive).
->>> LoopX.objects.all().order_by('y__x__y__x__id')
-[]
-
-# If the remote model does not have a default ordering, we order by its 'id'
@@ -831 +815 @@
-...     if i > 10: break
-
+Bug #7759 -- count should work with a partially read result set.
+>>> count = Number.objects.count()
+>>> qs = Number.objects.all()
+>>> for obj in qs:
+...     qs.count() == count
+...     break
+True
+
-"""}
-
+# In Python 2.3, exceptions raised in __len__ are swallowed (Python issue
+# 1242657), so these cases return an empty list, rather than raising an
+# exception. Not a lot we can do about that, unfortunately, due to the way
+# Python handles list() calls internally. Thus, we skip the tests for Python
+# 2.3.
+if sys.version_info >= (2, 4):
+    __test__["API_TESTS"] += """
+# If you're not careful, it's possible to introduce infinite loops via default
+# ordering on foreign keys in a cycle. We detect that.
+>>> LoopX.objects.all()
+Traceback (most recent call last):
+...
+FieldError: Infinite loop caused by ordering.
+
+>>> LoopZ.objects.all()
+Traceback (most recent call last):
+...
+FieldError: Infinite loop caused by ordering.
+
+# ... but you can still order in a non-recursive fashion amongst linked fields
+# (the previous test failed because the default ordering was recursive).
+>>> LoopX.objects.all().order_by('y__x__y__x__id')
+[]
+"""