1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

[soc2010/test-refactor] Merged up to trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/test-refactor@13428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Paul McMillan
2010-07-06 23:31:50 +00:00
parent ae2c227f51
commit 9315b44ad1
14 changed files with 57 additions and 38 deletions

View File

@@ -435,8 +435,6 @@ Anonymous users
instead of ``False``.
* :meth:`~django.contrib.auth.models.User.is_authenticated()` returns
``False`` instead of ``True``.
* :meth:`~django.contrib.auth.models.User.has_perm()` always returns
``False``.
* :meth:`~django.contrib.auth.models.User.set_password()`,
:meth:`~django.contrib.auth.models.User.check_password()`,
:meth:`~django.contrib.auth.models.User.save()`,

View File

@@ -5,7 +5,7 @@ Database access optimization
============================
Django's database layer provides various ways to help developers get the most
out of their databases. This documents gathers together links to the relevant
out of their databases. This document gathers together links to the relevant
documentation, and adds various tips, organized under an number of headings that
outline the steps to take when attempting to optimize your database usage.
@@ -108,9 +108,8 @@ Do database work in the database rather than in Python
For instance:
* At the most basic level, use :ref:`filter and exclude <queryset-api>` to
filtering in the database to avoid loading data into your Python process, only
to throw much of it away.
* At the most basic level, use :ref:`filter and exclude <queryset-api>` to do
filtering in the database.
* Use :ref:`F() object query expressions <query-expressions>` to do filtering
against other fields within the same model.
@@ -245,9 +244,6 @@ methods of individual instances, which means that any custom behaviour you have
added for these methods will not be executed, including anything driven from the
normal database object :ref:`signals <ref-signals>`.
Don't retrieve things you already have
======================================
Use foreign key values directly
-------------------------------

View File

@@ -11,7 +11,7 @@ Install Python
Being a Python Web framework, Django requires Python.
It works with any Python version from 2.4 to 2.6 (due to backwards
It works with any Python version from 2.4 to 2.7 (due to backwards
incompatibilities in Python 3.0, Django does not currently work with
Python 3.0; see :ref:`the Django FAQ <faq-install>` for more
information on supported Python versions and the 3.0 transition).

View File

@@ -169,7 +169,7 @@ For example::
json_serializer.serialize(queryset, ensure_ascii=False, stream=response)
The Django source code includes the simplejson_ module. However, if you're
using Python 2.6 (which includes a builtin version of the module), Django will
using Python 2.6 or later (which includes a builtin version of the module), Django will
use the builtin ``json`` module automatically. If you have a system installed
version that includes the C-based speedup extension, or your system version is
more recent than the version shipped with Django (currently, 2.0.7), the