app/gae_django.py
changeset 2414 a95ba3595554
parent 2335 366e64ecba91
equal deleted inserted replaced
2413:d0b7dac5325c 2414:a95ba3595554
    25   # alphabetical order by last name, please
    25   # alphabetical order by last name, please
    26   '"Pawel Solyga" <pawel.solyga@gmail.com>',
    26   '"Pawel Solyga" <pawel.solyga@gmail.com>',
    27   ]
    27   ]
    28 
    28 
    29 
    29 
    30 # Remove the standard version of Django.
    30 if os.environ['SERVER_SOFTWARE'].startswith('Dev'):
    31 for k in [k for k in sys.modules if k.startswith('django')]:
    31   
    32   del sys.modules[k]
    32   # Remove the standard version of Django.
       
    33   for k in [k for k in sys.modules if k.startswith('django')]:
       
    34     del sys.modules[k]
    33 
    35 
    34 # Force sys.path to have our own directory first, in case we want to import
    36   # Force sys.path to have our own directory first, in case we want to import
    35 # from it. This lets us replace the built-in Django
    37   # from it. This lets us replace the built-in Django
    36 sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
    38   sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
       
    39   sys.path.insert(0, os.path.abspath('django'))
       
    40   sys.path.insert(0, os.path.abspath('django.zip'))
    37 
    41 
    38 sys.path.insert(0, os.path.abspath('django.zip'))
    42 else:
       
    43   # Declare the Django version we need.
       
    44   from google.appengine.dist import use_library
       
    45   use_library('django', '1.0')
    39 
    46 
    40 # Force Django to reload its settings.
    47 # Force Django to reload its settings.
    41 from django.conf import settings
    48 from django.conf import settings
    42 settings._target = None
    49 settings._target = None
    43 
    50