Get rid of local Django copy.

--HG--
extra : rebase_source : 048740a4003f6f7af17aa73dbd6a85c01d011386

5 files changed, 6 insertions, 68 deletions

diff --git a/.hgignore b/.hgignore
index 5a8b2a8..e22d570 100644
--- a/.hgignore
+++ b/.hgignore
@@ -3,9 +3,6 @@ docs/build
 dist
 MANIFEST
 .coverage
-extras/appengine/django
-extras/appengine/django.zip
-extras/appengine/release
 extras/appengine/sqlparse
 extras/appengine/pygments
 extras/py3k/sqlparse
diff --git a/extras/appengine/Makefile b/extras/appengine/Makefile
index 28380cf..6a8f0f1 100644
--- a/extras/appengine/Makefile
+++ b/extras/appengine/Makefile
@@ -25,11 +25,8 @@ serve_email:
 serve_remote_email:
 	$(DEV_APPSERVER) --port=$(PORT) --enable_sendmail --address 0.0.0.0 .
 
-release: make_release.sh django/.svn
-	sh make_release.sh
-
 update: release
-	$(APPCFG) update release
+	$(APPCFG) update .
 
 upload: update
 
diff --git a/extras/appengine/app.yaml b/extras/appengine/app.yaml
index 6aa08b2..4c28413 100644
--- a/extras/appengine/app.yaml
+++ b/extras/appengine/app.yaml
@@ -1,5 +1,5 @@
 application: sqlformat
-version: 2
+version: 1
 runtime: python
 api_version: 1
 
diff --git a/extras/appengine/main.py b/extras/appengine/main.py
index 889bf2c..bd83ee6 100644
--- a/extras/appengine/main.py
+++ b/extras/appengine/main.py
@@ -33,17 +33,10 @@ import traceback
 logging.info('Loading %s, app version = %s',
              __name__, os.getenv('CURRENT_VERSION_ID'))
 
-# Delete the preloaded copy of Django.
-for key in [key for key in sys.modules if key.startswith('django')]:
-  del sys.modules[key]
-
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 
-# Force sys.path to have our own directory first, so we can import from it.
-sys.path.insert(0, os.path.abspath(os.path.dirname(__file__)))
-
-# Import Django from a zipfile.
-sys.path.insert(0, os.path.abspath('django.zip'))
+from google.appengine.dist import use_library
+use_library('django', '1.0')
 
 # Fail early if we can't import Django.  Log identifying information.
 import django
@@ -105,8 +98,8 @@ def log_exception(*args, **kwds):
 django.core.signals.got_request_exception.connect(log_exception)
 
 # Unregister Django's default rollback event handler.
-django.core.signals.got_request_exception.disconnect(
-    django.db._rollback_on_exception)
+#django.core.signals.got_request_exception.disconnect(
+#    django.db._rollback_on_exception)
 
 
 def real_main():
diff --git a/extras/appengine/make_release.sh b/extras/appengine/make_release.sh
deleted file mode 100755
index 956230c..0000000
--- a/extras/appengine/make_release.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# Script to create a "release" subdirectory.  This is a subdirectory
-# containing a bunch of symlinks, from which the app can be updated.
-# The main reason for this is to import Django from a zipfile, which
-# saves dramatically in upload time: statting and computing the SHA1
-# for 1000s of files is slow.  Even if most of those files don't
-# actually need to be uploaded, they still add to the work done for
-# each update.
-
-ZIPFILE=django.zip
-RELEASE=release
-FILES="app.yaml index.yaml __init__.py main.py settings.py"
-DIRS="static templates sqlparse pygments sqlformat examples"
-
-# Remove old $ZIPFILE file.
-rm -rf $ZIPFILE
-
-# Create new $ZIPFILE file.
-# We prune:
-# - .svn subdirectories for obvious reasons.
-# - contrib/gis/ and related files because it's huge and unneeded.
-# - *.po and *.mo files because they are bulky and unneeded.
-# - *.pyc and *.pyo because they aren't used by App Engine anyway.
-zip -q $ZIPFILE `find django \
-    -name .svn -prune -o \
-    -name gis -prune -o \
-    -name admin -prune -o \
-    -name localflavor -prune -o \
-    -name mysql -prune -o \
-    -name mysql_old -prune -o \
-    -name oracle -prune -o \
-    -name postgresql-prune -o \
-    -name postgresql_psycopg2 -prune -o \
-    -name sqlite3 -prune -o \
-    -name test -prune -o \
-    -type f ! -name \*.py[co] ! -name \*.[pm]o -print`
-
-# Remove old $RELEASE directory.
-rm -rf $RELEASE
-
-# Create new $RELEASE directory.
-mkdir $RELEASE
-
-# Create symbolic links.
-for x in $FILES $DIRS $ZIPFILE
-do
-    ln -s ../$x $RELEASE/$x
-done