Django

Code

Show
Ignore:
Timestamp:
12/14/07 19:38:43 (1 year ago)
Author:
jbronn
Message:

gis: Merged revisions 6672,6686-6688,6690,6693,6707-6708,6726,6730,6753,6755-6762,6764,6776-6777,6779,6782-6919 via svnmerge from trunk; reverted oracle backend base.py due to ikelly's patch in r6905.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-6671,6673-6781 to /django/trunk:1-6919

  • django/branches/gis/django/shortcuts/__init__.py

    r6394 r6920  
    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    """