Commit 680a0f08 authored by Claude Paroz's avatar Claude Paroz
Browse files

Updated doc links to point to Python 3 documentation

parent 6d6af724
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -118,10 +118,10 @@ show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'trac'

# Links to Python's docs should reference the most recent version of the 2.x
# Links to Python's docs should reference the most recent version of the 3.x
# branch, which is located at this URL.
intersphinx_mapping = {
    'python': ('http://docs.python.org/', None),
    'python': ('http://docs.python.org/3/', None),
    'sphinx': ('http://sphinx-doc.org/', None),
    'six': ('http://pythonhosted.org/six/', None),
    'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None),
+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ the Python import path to your :file:`mysite/settings.py` file.
    >>> import django
    >>> django.setup()

    If this raises an :exc:`~exceptions.AttributeError`, you're probably using
    If this raises an :exc:`AttributeError`, you're probably using
    a version of Django that doesn't match this tutorial version. You'll want
    to either switch to the older tutorial or the newer Django version.

+2 −2
Original line number Diff line number Diff line
@@ -106,9 +106,9 @@ This code includes a few things we haven't covered yet in this tutorial:
  <django.http.HttpRequest.POST>` in our code, to ensure that data is only
  altered via a POST call.

* ``request.POST['choice']`` will raise :exc:`~exceptions.KeyError` if
* ``request.POST['choice']`` will raise :exc:`KeyError` if
  ``choice`` wasn't provided in POST data. The above code checks for
  :exc:`~exceptions.KeyError` and redisplays the question form with an error
  :exc:`KeyError` and redisplays the question form with an error
  message if ``choice`` isn't given.

* After incrementing the choice count, the code returns an
+7 −7
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ Methods
.. method:: AppConfig.get_model(model_name)

    Returns the :class:`~django.db.models.Model` with the given
    ``model_name``. Raises :exc:`~exceptions.LookupError` if no such model
    exists. ``model_name`` is case-insensitive.
    ``model_name``. Raises :exc:`LookupError` if no such model exists.
    ``model_name`` is case-insensitive.

.. method:: AppConfig.ready()

@@ -284,8 +284,8 @@ Application registry
.. method:: apps.get_app_config(app_label)

    Returns an :class:`~django.apps.AppConfig` for the application with the
    given ``app_label``. Raises :exc:`~exceptions.LookupError` if no such
    application exists.
    given ``app_label``. Raises :exc:`LookupError` if no such application
    exists.

.. method:: apps.is_installed(app_name)

@@ -303,9 +303,9 @@ Application registry
    argument in the form ``app_label.model_name``. ``model_name`` is case-
    insensitive.

    Raises :exc:`~exceptions.LookupError` if no such application or model
    exists. Raises :exc:`~exceptions.ValueError` when called with a single
    argument that doesn't contain exactly one dot.
    Raises :exc:`LookupError` if no such application or model exists. Raises
    :exc:`ValueError` when called with a single argument that doesn't contain
    exactly one dot.

.. _applications-troubleshooting:

+1 −2
Original line number Diff line number Diff line
@@ -279,8 +279,7 @@ Anonymous users
    * :meth:`~django.contrib.auth.models.User.set_password()`,
      :meth:`~django.contrib.auth.models.User.check_password()`,
      :meth:`~django.db.models.Model.save` and
      :meth:`~django.db.models.Model.delete()` raise
      :exc:`~exceptions.NotImplementedError`.
      :meth:`~django.db.models.Model.delete()` raise :exc:`NotImplementedError`.

In practice, you probably won't need to use
:class:`~django.contrib.auth.models.AnonymousUser` objects on your own, but
Loading