commit merge

2012-08-29 14:24:14 +02:00
parent f9afeb51f8
commit e5f9358cf9
75 changed files with 1546 additions and 2066 deletions
@@ -18,7 +18,8 @@ if not hasattr(os, 'mkdir'):
 if global_settings.db_sessions is not True:
    global_settings.db_sessions = set()

-global_settings.gluon_parent = os.environ.get('web2py_path', os.getcwd())
+global_settings.gluon_parent = \
+    os.environ.get('web2py_path', os.getcwd())

 global_settings.applications_parent = global_settings.gluon_parent

@@ -26,12 +27,14 @@ global_settings.app_folders = set()

 global_settings.debugging = False

-global_settings.is_pypy = hasattr(platform,'python_implementation') and \
-                          platform.python_implementation() == 'PyPy'
+global_settings.is_pypy = \
+    hasattr(platform,'python_implementation') and \
+    platform.python_implementation() == 'PyPy'

-global_settings.is_jython = 'java' in sys.platform.lower() or \
-                            hasattr(sys, 'JYTHON_JAR') or \
-                            str(sys.copyright).find('Jython') > 0
+global_settings.is_jython = \
+    'java' in sys.platform.lower() or \
+    hasattr(sys, 'JYTHON_JAR') or \
+    str(sys.copyright).find('Jython') > 0