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,6 +300,7 @@ def initialize_urandom():
     try:
         os.urandom(1)
         have_urandom = True
+        if sys.platform != 'win32':
             try:
                 # try to add process-specific entropy
                 frandom = open('/dev/urandom', 'wb')