synced with gluino

2013-07-09 16:15:21 -05:00
parent 89e158cd1d
commit cadf0e946a
3 changed files with 8 additions and 5 deletions
@@ -39,9 +39,12 @@ import re
 import cStringIO
 from gluon import current, redirect
 import inspect
-import settings
-is_gae = settings.global_settings.web2py_runtime_gae

+try:
+    import settings
+    is_gae = settings.global_settings.web2py_runtime_gae
+except ImportError:
+    is_gae = False