Fixed globals

This commit is contained in:
gi0baro
2014-09-25 13:16:54 +02:00
parent 6b38fb769b
commit db01261c35
+6 -5
View File
@@ -25,6 +25,7 @@ from gluon.serializers import json, custom_json
import gluon.settings as settings import gluon.settings as settings
from gluon.utils import web2py_uuid, secure_dumps, secure_loads from gluon.utils import web2py_uuid, secure_dumps, secure_loads
from gluon.settings import global_settings from gluon.settings import global_settings
from gluon.dal import Field
from gluon import recfile from gluon import recfile
import hashlib import hashlib
import portalocker import portalocker
@@ -197,7 +198,7 @@ class Request(Storage):
def parse_get_vars(self): def parse_get_vars(self):
"""Takes the QUERY_STRING and unpacks it to get_vars """Takes the QUERY_STRING and unpacks it to get_vars
""" """
query_string = self.env.get('QUERY_STRING', '') query_string = self.env.get('QUERY_STRING', '')
dget = urlparse.parse_qs(query_string, keep_blank_values=1) # Ref: https://docs.python.org/2/library/cgi.html#cgi.parse_qs dget = urlparse.parse_qs(query_string, keep_blank_values=1) # Ref: https://docs.python.org/2/library/cgi.html#cgi.parse_qs
get_vars = self._get_vars = Storage(dget) get_vars = self._get_vars = Storage(dget)
for (key, value) in get_vars.iteritems(): for (key, value) in get_vars.iteritems():
@@ -254,7 +255,7 @@ class Request(Storage):
# its value else leave it alone # its value else leave it alone
pvalue = listify([(_dpk if _dpk.filename else _dpk.value) pvalue = listify([(_dpk if _dpk.filename else _dpk.value)
for _dpk in dpk] for _dpk in dpk]
if isinstance(dpk, list) else if isinstance(dpk, list) else
(dpk if dpk.filename else dpk.value)) (dpk if dpk.filename else dpk.value))
if len(pvalue): if len(pvalue):
@@ -393,7 +394,7 @@ class Response(Storage):
self._view_environment = None self._view_environment = None
self._custom_commit = None self._custom_commit = None
self._custom_rollback = None self._custom_rollback = None
self.generic_patterns = ['*'] self.generic_patterns = ['*']
self.delimiters = ('{{','}}') self.delimiters = ('{{','}}')
self.formstyle = 'table3cols' self.formstyle = 'table3cols'
self.form_label_separator = ': ' self.form_label_separator = ': '
@@ -691,10 +692,10 @@ class Response(Storage):
DIV(BEAUTIFY(current.response), backtotop, DIV(BEAUTIFY(current.response), backtotop,
_class="w2p-toolbar-hidden", _id="response-%s" % u), _class="w2p-toolbar-hidden", _id="response-%s" % u),
DIV(BEAUTIFY(dbtables), backtotop, DIV(BEAUTIFY(dbtables), backtotop,
_class="w2p-toolbar-hidden",_id="db-tables-%s" % u), _class="w2p-toolbar-hidden",_id="db-tables-%s" % u),
DIV(BEAUTIFY(dbstats), backtotop, DIV(BEAUTIFY(dbstats), backtotop,
_class="w2p-toolbar-hidden", _id="db-stats-%s" % u), _class="w2p-toolbar-hidden", _id="db-stats-%s" % u),
SCRIPT("jQuery('.w2p-toolbar-hidden').hide()"), SCRIPT("jQuery('.w2p-toolbar-hidden').hide()"),
_id="totop-%s" % u _id="totop-%s" % u
) )