Django

Code

Show
Ignore:
Timestamp:
12/03/07 11:37:33 (1 year ago)
Author:
jkocherhans
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6782 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-6863

  • django/branches/newforms-admin/django/shortcuts/__init__.py

    r6342 r6864  
    3939    arguments and keyword arguments are used in the get() query. 
    4040 
    41     Note: Like with get(), an AssertionError will be raised if more than one 
     41    Note: Like with get(), an MultipleObjectsReturned will be raised if more than one 
    4242    object is found. 
    4343    """