Merge branch 'master' of github.com:web2py/web2py

gluon/compileapp.py

@@ -640,7 +640,7 @@ def run_controller_in(controller, function, environment):
         ccode = getcfs(layer, filename, lambda: compile2(code, layer))
 
     restricted(ccode, environment, layer=filename)
-    response = current.response
+    response = environment["response"]
     vars = response._vars
     if response.postprocessing:
         vars = reduce(lambda vars, p: p(vars), response.postprocessing, vars)

gluon/utils.py

@@ -17,6 +17,7 @@ import random
 import inspect
 import time
 import os
+import sys
 import re
 import logging
 import socket
@@ -299,19 +300,20 @@ def initialize_urandom():
     try:
         os.urandom(1)
         have_urandom = True
-        try:
+        if sys.platform != 'win32':
-            # try to add process-specific entropy
-            frandom = open('/dev/urandom', 'wb')
             try:
-                if PY2:
+                # try to add process-specific entropy
-                    frandom.write(''.join(chr(t) for t in ctokens))
+                frandom = open('/dev/urandom', 'wb')
-                else:
+                try:
-                    frandom.write(bytes([]).join(bytes([t]) for t in ctokens))
+                    if PY2:
-            finally:
+                        frandom.write(''.join(chr(t) for t in ctokens))
-                frandom.close()
+                    else:
-        except IOError:
+                        frandom.write(bytes([]).join(bytes([t]) for t in ctokens))
-            # works anyway
+                finally:
-            pass
+                    frandom.close()
+            except IOError:
+                # works anyway
+                pass
     except NotImplementedError:
         have_urandom = False
         logger.warning(