dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http://code.google.com/p/web2py/issues/detail?id=464, thanks alwassoc

Browse Source
This commit is contained in:
Massimo DiPierro
2011-12-03 00:35:16 -06:00
parent 51cad9f409
commit ec2addf0ef
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.3 (2011-12-03 00:25:21) dev Version 1.99.3 (2011-12-03 00:35:14) dev
gluon/compileapp.py
+5
View File
@@ -40,12 +40,15 @@ import imp
import logging import logging
logger = logging.getLogger("web2py") logger = logging.getLogger("web2py")
import rewrite import rewrite
import platform
try: try:
import py_compile import py_compile
except: except:
logger.warning('unable to import py_compile') logger.warning('unable to import py_compile')
is_pypy = True if platform.python_implementation() == 'PyPy' else False
settings.global_settings.is_pypy = is_pypy
is_gae = settings.global_settings.web2py_runtime_gae is_gae = settings.global_settings.web2py_runtime_gae
is_jython = settings.global_settings.is_jython = 'java' in sys.platform.lower() or hasattr(sys, 'JYTHON_JAR') or str(sys.copyright).find('Jython') > 0 is_jython = settings.global_settings.is_jython = 'java' in sys.platform.lower() or hasattr(sys, 'JYTHON_JAR') or str(sys.copyright).find('Jython') > 0
@@ -344,6 +347,8 @@ def build_environment(request, response, session, store_current=True):
global __builtins__ global __builtins__
if is_jython: # jython hack if is_jython: # jython hack
__builtins__ = mybuiltin() __builtins__ = mybuiltin()
elif is_pypy: # apply the same hack to pypy too
__builtins__ = mybuiltin()
else: else:
__builtins__['__import__'] = __builtin__.__import__ ### WHY? __builtins__['__import__'] = __builtin__.__import__ ### WHY?
environment['__builtins__'] = __builtins__ environment['__builtins__'] = __builtins__