Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (5 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7978 to /django/trunk:1-8214
  • django/branches/gis/django/contrib/sites/tests.py

    r7768 r8215  
    11""" 
     2>>> from django.contrib.sites.models import Site 
     3>>> from django.conf import settings 
     4>>> Site(id=settings.SITE_ID, domain="example.com", name="example.com").save() 
     5         
    26>>> # Make sure that get_current() does not return a deleted Site object. 
    3 >>> from django.contrib.sites.models import Site 
    47>>> s = Site.objects.get_current() 
    58>>> isinstance(s, Site)