global options are back

gluon/globals.py

@@ -186,6 +186,7 @@ class Request(Storage):
         Storage.__init__(self)
         self.env = Storage(env)
         self.env.web2py_path = global_settings.applications_parent
+        self.env.update(global_settings)
         self.cookies = Cookie.SimpleCookie()
         self._get_vars = None
         self._post_vars = None
@@ -201,6 +202,7 @@ class Request(Storage):
         self.is_restful = False
         self.is_https = False
         self.is_local = False
+        self.global_settings = settings.global_settings
         self._uuid = None
 
     def parse_get_vars(self):

gluon/widget.py

@@ -17,6 +17,7 @@ import time
 import thread
 import threading
 import os
+import copy
 import socket
 import signal
 import math
@@ -940,7 +941,10 @@ def console():
     sys.argv, other_args = sys.argv[:k], sys.argv[k + 1:]
     (options, args) = parser.parse_args()
     options.args = [options.run] + other_args
-    global_settings.cmd_options = options
+    
+    copy_options = copy.deepcopy(options)
+    copy_options.password = '******'
+    global_settings.cmd_options = copy_options
     global_settings.cmd_args = args
 
     if options.gae: