From 8a4f96e619fe90d9f023cdb6aea3f0148fff4ac0 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Wed, 4 Jul 2012 17:02:38 -0500
Subject: [PATCH] issue 873, thanks Howesc

---
 VERSION        | 2 +-
 gluon/admin.py | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 8a0f3edf..38771935 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-07-01 22:43:58) dev
+Version 2.00.0 (2012-07-04 17:02:32) dev
diff --git a/gluon/admin.py b/gluon/admin.py
index 3d80f9f5..e053800c 100644
--- a/gluon/admin.py
+++ b/gluon/admin.py
@@ -7,7 +7,6 @@ Utility functions for the Admin application
 ===========================================
 """
 import os
-import site
 import sys
 import traceback
 import zipfile
@@ -20,6 +19,9 @@ from fileutils import read_file, write_file, parse_version
 from restricted import RestrictedError
 from settings import global_settings
 
+if not global_settings.web2py_runtime_gae:
+    import site
+
 def apath(path='', r=None):
     """
     Builds a path inside an application folder
@@ -435,7 +437,8 @@ def upgrade(request, url='http://web2py.com'):
 
 def add_path_first(path):
     sys.path = [path]+[p for p in sys.path if (not p==path and not p==(path+'/'))]
-    site.addsitedir(path)
+    if not global_settings.web2py_runtime_gae:
+        site.addsitedir(path)
 
 def create_missing_folders():
     if not global_settings.web2py_runtime_gae: