← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python-django/quantal

« back to all changes in this revision

Viewing changes to docs/topics/http/shortcuts.txt

  • Committer: Bazaar Package Importer
  • Author(s): Krzysztof Klimonda
  • Date: 2009-10-12 19:22:16 UTC
  • mfrom: (1.1.9 upstream) (4.4.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091012192216-l4wb7fp72wow19zp
Tags: 1.1.1-1ubuntu1
https://launchpad.net/bugs/447617
https://launchpad.net/bugs/445639
* Merge python-django 1.1.1-1 from debian unstable (LP: #447617)
  for security and bug fixes, all Ubuntu changes merged by Debian.
* Add to debian/patches:
  - 20_python2.6.3_regression.patch - backported upstream commit 11620
    to make Django work with Python 2.6.3 properly. (LP: #445639)

Show diffs side-by-side

added added

removed removed

Lines of Context:
docs/topics/http/shortcuts.txt
147
147
``get_object_or_404``
148
148
=====================
149
149
 
150
 
.. function:: get_object_or_404(object, *args, **kwargs)
 
150
.. function:: get_object_or_404(klass, *args, **kwargs)
151
151
 
152
152
   Calls :meth:`~django.db.models.QuerySet.get()` on a given model manager,
153
153
   but it raises ``django.http.Http404`` instead of the model's