@@ -2,17 +2,9 @@ import logging import os import sys -# Remove the standard version of Django. -for k in [k for k in sys.modules if k.startswith('django')]: - del sys.modules[k] - -# Import Django from a zipfile if we don't have it on our path. -if "django" not in os.listdir(os.path.abspath(os.path.dirname(__file__))): - sys.path.insert(0, os.path.abspath('django.zip')) - -# Force sys.path to have our own directory first, in case we want to import -# from it. -sys.path.insert(0, os.path.abspath(os.path.dirname(__file__))) +# Use Django 1.0 +from google.appengine.dist import use_library +use_library("django", "1.0") # Google App Engine imports. from google.appengine.ext.webapp import util main.py django.zip 18d3b04cd4dd9a10f22d89a5e12a06e391d52056 Benjamin Golub bgolub@benjamingolub.com http://github.com/bgolub/fftogo/commit/bd2b27124bde0b8ec0207ea2331de82fa912f0dc bd2b27124bde0b8ec0207ea2331de82fa912f0dc 2009-06-20T12:14:38-07:00 2009-06-20T12:14:38-07:00 no need to zipimport f2b7f382493ec3fb506a8cc07b0d4fa894b1ea05 Benjamin Golub bgolub@benjamingolub.com