← Back to branch summary

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

« back to all changes in this revision

Viewing changes to django/views/generic/create_update.py

  • Committer: Bazaar Package Importer
  • Author(s): Chris Lamb
  • Date: 2009-07-29 11:26:28 UTC
  • mfrom: (1.1.8 upstream) (4.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20090729112628-pg09ino8sz0sj21t
Tags: 1.1-1
http://bugs.debian.org/538863
* New upstream release.
* Merge from experimental:
  - Ship FastCGI initscript and /etc/default file in python-django's examples
    directory (Closes: #538863)
  - Drop "05_10539-sphinx06-compatibility.diff"; it has been applied
    upstream.
  - Bump Standards-Version to 3.8.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
django/views/generic/create_update.py
71
71
def lookup_object(model, object_id, slug, slug_field):
72
72
    """
73
73
    Return the ``model`` object with the passed ``object_id``.  If
74
 
    ``object_id`` is None, then return the the object whose ``slug_field``
 
74
    ``object_id`` is None, then return the object whose ``slug_field``
75
75
    equals the passed ``slug``.  If ``slug`` and ``slug_field`` are not passed,
76
76
    then raise Http404 exception.
77
77
    """