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

Merge pull request #1224 from BuhtigithuB/pep8-html-py

Browse Source 
Improve PEP8
This commit is contained in:
mdipierro
2016-03-18 20:31:15 -05:00
parent 8ce528327c a981ca52e8
commit e76ecec14f
1 changed files with 85 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/html.py
+85 -89
View File
@@ -116,6 +116,7 @@ __all__ = [
DEFAULT_PASSWORD_DISPLAY = '*' * 8 DEFAULT_PASSWORD_DISPLAY = '*' * 8
def xmlescape(data, quote=True): def xmlescape(data, quote=True):
""" """
Returns an escaped string of the provided data Returns an escaped string of the provided data
@@ -139,12 +140,14 @@ def xmlescape(data, quote=True):
data = cgi.escape(data, quote).replace("'", "'") data = cgi.escape(data, quote).replace("'", "'")
return data return data
def call_as_list(f, *a, **b): def call_as_list(f, *a, **b):
if not isinstance(f, (list, tuple)): if not isinstance(f, (list, tuple)):
f = [f] f = [f]
for item in f: for item in f:
item(*a, **b) item(*a, **b)
def truncate_string(text, length, dots='...'): def truncate_string(text, length, dots='...'):
text = text.decode('utf-8') text = text.decode('utf-8')
if len(text) > length: if len(text) > length:
@@ -152,27 +155,26 @@ def truncate_string(text, length, dots='...'):
return text return text
def URL( def URL(a=None,
a=None, c=None,
c=None, f=None,
f=None, r=None,
r=None, args=None,
args=None, vars=None,
vars=None, anchor='',
anchor='', extension=None,
extension=None, env=None,
env=None, hmac_key=None,
hmac_key=None, hash_vars=True,
hash_vars=True, salt=None,
salt=None, user_signature=None,
user_signature=None, scheme=None,
scheme=None, host=None,
host=None, port=None,
port=None, encode_embedded_slash=False,
encode_embedded_slash=False, url_encode=True,
url_encode=True, language=None
language=None, ):
):
""" """
generates a url '/a/c/f' corresponding to application a, controller c generates a url '/a/c/f' corresponding to application a, controller c
and function f. If r=request is passed, a, c, f are set, respectively, and function f. If r=request is passed, a, c, f are set, respectively,
@@ -256,10 +258,6 @@ def URL(
>>> str(URL(a='a', c='c', f='f', anchor='%(id)d', url_encode=True)) >>> str(URL(a='a', c='c', f='f', anchor='%(id)d', url_encode=True))
'/a/c/f#%25%28id%29d' '/a/c/f#%25%28id%29d'
""" """
from rewrite import url_out # done here in case used not-in web2py from rewrite import url_out # done here in case used not-in web2py
@@ -439,7 +437,7 @@ def verifyURL(request, hmac_key=None, hash_vars=True, salt=None, user_signature=
""" """
if not '_signature' in request.get_vars: if '_signature' not in request.get_vars:
return False # no signature in the request URL return False # no signature in the request URL
# check if user_signature requires # check if user_signature requires
@@ -539,19 +537,24 @@ class XmlComponent(object):
return CAT(*components) return CAT(*components)
def add_class(self, name): def add_class(self, name):
""" add a class to _class attribute """ """
add a class to _class attribute
"""
c = self['_class'] c = self['_class']
classes = (set(c.split()) if c else set()) | set(name.split()) classes = (set(c.split()) if c else set()) | set(name.split())
self['_class'] = ' '.join(classes) if classes else None self['_class'] = ' '.join(classes) if classes else None
return self return self
def remove_class(self, name): def remove_class(self, name):
""" remove a class from _class attribute """ """
remove a class from _class attribute
"""
c = self['_class'] c = self['_class']
classes = (set(c.split()) if c else set()) - set(name.split()) classes = (set(c.split()) if c else set()) - set(name.split())
self['_class'] = ' '.join(classes) if classes else None self['_class'] = ' '.join(classes) if classes else None
return self return self
class XML(XmlComponent): class XML(XmlComponent):
""" """
use it to wrap a string that contains XML/HTML so that it will not be use it to wrap a string that contains XML/HTML so that it will not be
@@ -664,7 +667,7 @@ class XML(XmlComponent):
""" """
return [] return []
### important to allow safe session.flash=T(....) # ## important to allow safe session.flash=T(....)
def XML_unpickle(data): def XML_unpickle(data):
@@ -1172,7 +1175,7 @@ class DIV(XmlComponent):
# loop the components # loop the components
if find_text or find_components: if find_text or find_components:
i = 0 i = 0
while i<len(self.components): while i < len(self.components):
c = self[i] c = self[i]
j = i+1 j = i+1
if check and find_text and isinstance(c, str) and \ if check and find_text and isinstance(c, str) and \
@@ -1265,6 +1268,7 @@ class __tag_div__(DIV):
copy_reg.pickle(__tag_div__, TAG_pickler, TAG_unpickler) copy_reg.pickle(__tag_div__, TAG_pickler, TAG_unpickler)
class __TAG__(XmlComponent): class __TAG__(XmlComponent):
""" """
@@ -1589,6 +1593,7 @@ class A(DIV):
self['_data-w2p_pre_call'] = self['pre_call'] self['_data-w2p_pre_call'] = self['pre_call']
return DIV.xml(self) return DIV.xml(self)
class BUTTON(DIV): class BUTTON(DIV):
tag = 'button' tag = 'button'
@@ -1863,11 +1868,11 @@ class INPUT(DIV):
print traceback.format_exc() print traceback.format_exc()
msg = "Validation error, field:%s %s" % (name,validator) msg = "Validation error, field:%s %s" % (name,validator)
raise Exception(msg) raise Exception(msg)
if not errors is None: if errors is not None:
self.vars[name] = value self.vars[name] = value
self.errors[name] = errors self.errors[name] = errors
break break
if not name in self.errors: if name not in self.errors:
self.vars[name] = value self.vars[name] = value
return True return True
return False return False
@@ -1882,7 +1887,7 @@ class INPUT(DIV):
_value = None _value = None
else: else:
_value = str(self['_value']) _value = str(self['_value'])
if '_checked' in self.attributes and not 'value' in self.attributes: if '_checked' in self.attributes and 'value' not in self.attributes:
pass pass
elif t == 'checkbox': elif t == 'checkbox':
if not _value: if not _value:
@@ -1912,8 +1917,7 @@ class INPUT(DIV):
if name and hasattr(self, 'errors') \ if name and hasattr(self, 'errors') \
and self.errors.get(name, None) \ and self.errors.get(name, None) \
and self['hideerror'] != True: and self['hideerror'] != True:
self['_class'] = (self['_class'] and self['_class'] self['_class'] = (self['_class'] and self['_class'] + ' ' or '') + 'invalidinput'
+ ' ' or '') + 'invalidinput'
return DIV.xml(self) + DIV( return DIV.xml(self) + DIV(
DIV( DIV(
self.errors[name], _class='error', self.errors[name], _class='error',
@@ -1941,11 +1945,11 @@ class TEXTAREA(INPUT):
tag = 'textarea' tag = 'textarea'
def _postprocessing(self): def _postprocessing(self):
if not '_rows' in self.attributes: if '_rows' not in self.attributes:
self['_rows'] = 10 self['_rows'] = 10
if not '_cols' in self.attributes: if '_cols' not in self.attributes:
self['_cols'] = 40 self['_cols'] = 40
if not self['value'] is None: if self['value'] is not None:
self.components = [self['value']] self.components = [self['value']]
elif self.components: elif self.components:
self['value'] = self.components[0] self['value'] = self.components[0]
@@ -1956,7 +1960,7 @@ class OPTION(DIV):
tag = 'option' tag = 'option'
def _fixup(self): def _fixup(self):
if not '_value' in self.attributes: if '_value' not in self.attributes:
self.attributes['_value'] = str(self.components[0]) self.attributes['_value'] = str(self.components[0])
@@ -2012,11 +2016,10 @@ class SELECT(INPUT):
options = itertools.chain(*component_list) options = itertools.chain(*component_list)
value = self['value'] value = self['value']
if not value is None: if value is not None:
if not self['_multiple']: if not self['_multiple']:
for c in options: # my patch for c in options: # my patch
if ((value is not None) and if ((value is not None) and (str(c['_value']) == str(value))):
(str(c['_value']) == str(value))):
c['_selected'] = 'selected' c['_selected'] = 'selected'
else: else:
c['_selected'] = None c['_selected'] = None
@@ -2026,8 +2029,7 @@ class SELECT(INPUT):
else: else:
values = [str(value)] values = [str(value)]
for c in options: # my patch for c in options: # my patch
if ((value is not None) and if ((value is not None) and (str(c['_value']) in values)):
(str(c['_value']) in values)):
c['_selected'] = 'selected' c['_selected'] = 'selected'
else: else:
c['_selected'] = None c['_selected'] = None
@@ -2077,16 +2079,15 @@ class FORM(DIV):
def assert_status(self, status, request_vars): def assert_status(self, status, request_vars):
return status return status
def accepts( def accepts(self,
self, request_vars,
request_vars, session=None,
session=None, formname='default',
formname='default', keepvalues=False,
keepvalues=False, onvalidation=None,
onvalidation=None, hideerror=False,
hideerror=False, **kwargs
**kwargs ):
):
""" """
kwargs is not used but allows to specify the same interface for FORM and SQLFORM kwargs is not used but allows to specify the same interface for FORM and SQLFORM
""" """
@@ -2128,8 +2129,7 @@ class FORM(DIV):
onsuccess = onvalidation.get('onsuccess', None) onsuccess = onvalidation.get('onsuccess', None)
onfailure = onvalidation.get('onfailure', None) onfailure = onvalidation.get('onfailure', None)
onchange = onvalidation.get('onchange', None) onchange = onvalidation.get('onchange', None)
if [k for k in onvalidation if not k in ( if [k for k in onvalidation if k not in ('onsuccess', 'onfailure', 'onchange')]:
'onsuccess', 'onfailure', 'onchange')]:
raise RuntimeError('Invalid key in onvalidate dict') raise RuntimeError('Invalid key in onvalidate dict')
if onsuccess and status: if onsuccess and status:
call_as_list(onsuccess, self) call_as_list(onsuccess, self)
@@ -2144,7 +2144,7 @@ class FORM(DIV):
call_as_list(onvalidation, self) call_as_list(onvalidation, self)
if self.errors: if self.errors:
status = False status = False
if not session is None: if session is not None:
if hasattr(self, 'record_hash'): if hasattr(self, 'record_hash'):
formkey = self.record_hash + ':' + web2py_uuid() formkey = self.record_hash + ':' + web2py_uuid()
else: else:
@@ -2158,25 +2158,22 @@ class FORM(DIV):
return status return status
def _postprocessing(self): def _postprocessing(self):
if not '_action' in self.attributes: if '_action' not in self.attributes:
self['_action'] = '#' self['_action'] = '#'
if not '_method' in self.attributes: if '_method' not in self.attributes:
self['_method'] = 'post' self['_method'] = 'post'
if not '_enctype' in self.attributes: if '_enctype' not in self.attributes:
self['_enctype'] = 'multipart/form-data' self['_enctype'] = 'multipart/form-data'
def hidden_fields(self): def hidden_fields(self):
c = [] c = []
attr = self.attributes.get('hidden', {}) attr = self.attributes.get('hidden', {})
if 'hidden' in self.attributes: if 'hidden' in self.attributes:
c = [INPUT(_type='hidden', _name=key, _value=value) c = [INPUT(_type='hidden', _name=key, _value=value) for (key, value) in attr.iteritems()]
for (key, value) in attr.iteritems()]
if hasattr(self, 'formkey') and self.formkey: if hasattr(self, 'formkey') and self.formkey:
c.append(INPUT(_type='hidden', _name='_formkey', c.append(INPUT(_type='hidden', _name='_formkey', _value=self.formkey))
_value=self.formkey))
if hasattr(self, 'formname') and self.formname: if hasattr(self, 'formname') and self.formname:
c.append(INPUT(_type='hidden', _name='_formname', c.append(INPUT(_type='hidden', _name='_formname', _value=self.formname))
_value=self.formname))
return DIV(c, _style="display:none;") return DIV(c, _style="display:none;")
def xml(self): def xml(self):
@@ -2221,8 +2218,7 @@ class FORM(DIV):
kwargs['request_vars'] = kwargs.get( kwargs['request_vars'] = kwargs.get(
'request_vars', current.request.post_vars) 'request_vars', current.request.post_vars)
kwargs['session'] = kwargs.get('session', current.session) kwargs['session'] = kwargs.get('session', current.session)
kwargs['dbio'] = kwargs.get('dbio', False) kwargs['dbio'] = kwargs.get('dbio', False) # necessary for SQLHTML forms
# necessary for SQLHTML forms
onsuccess = kwargs.get('onsuccess', 'flash') onsuccess = kwargs.get('onsuccess', 'flash')
onfailure = kwargs.get('onfailure', 'flash') onfailure = kwargs.get('onfailure', 'flash')
@@ -2301,8 +2297,7 @@ class FORM(DIV):
""" """
kwargs['dbio'] = kwargs.get('dbio', True) kwargs['dbio'] = kwargs.get('dbio', True) # necessary for SQLHTML forms
# necessary for SQLHTML forms
self.validate(**kwargs) self.validate(**kwargs)
return self return self
@@ -2348,10 +2343,9 @@ class FORM(DIV):
def sanitizer(obj): def sanitizer(obj):
if isinstance(obj, dict): if isinstance(obj, dict):
for k in obj.keys(): for k in obj.keys():
if any([unsafe in str(k).upper() for if any([unsafe in str(k).upper() for unsafe in UNSAFE]):
unsafe in UNSAFE]): # erease unsafe pair
# erease unsafe pair obj.pop(k)
obj.pop(k)
else: else:
# not implemented # not implemented
pass pass
@@ -2377,8 +2371,10 @@ class FORM(DIV):
return [flatten(item) for item in newobj] return [flatten(item) for item in newobj]
else: else:
return newobj return newobj
else: return str(newobj) else:
else: return newobj return str(newobj)
else:
return newobj
return flatten(d) return flatten(d)
def as_json(self, sanitize=True): def as_json(self, sanitize=True):
@@ -2505,19 +2501,19 @@ class MENU(DIV):
self.data = data self.data = data
self.attributes = args self.attributes = args
self.components = [] self.components = []
if not '_class' in self.attributes: if '_class' not in self.attributes:
self['_class'] = 'web2py-menu web2py-menu-vertical' self['_class'] = 'web2py-menu web2py-menu-vertical'
if not 'ul_class' in self.attributes: if 'ul_class' not in self.attributes:
self['ul_class'] = 'web2py-menu-vertical' self['ul_class'] = 'web2py-menu-vertical'
if not 'li_class' in self.attributes: if 'li_class' not in self.attributes:
self['li_class'] = 'web2py-menu-expand' self['li_class'] = 'web2py-menu-expand'
if not 'li_first' in self.attributes: if 'li_first' not in self.attributes:
self['li_first'] = 'web2py-menu-first' self['li_first'] = 'web2py-menu-first'
if not 'li_last' in self.attributes: if 'li_last' not in self.attributes:
self['li_last'] = 'web2py-menu-last' self['li_last'] = 'web2py-menu-last'
if not 'li_active' in self.attributes: if 'li_active' not in self.attributes:
self['li_active'] = 'web2py-menu-active' self['li_active'] = 'web2py-menu-active'
if not 'mobile' in self.attributes: if 'mobile' not in self.attributes:
self['mobile'] = False self['mobile'] = False
def serialize(self, data, level=0): def serialize(self, data, level=0):
@@ -2587,12 +2583,11 @@ class MENU(DIV):
return self.serialize(self.data, 0).xml() return self.serialize(self.data, 0).xml()
def embed64( def embed64(filename=None,
filename=None, file=None,
file=None, data=None,
data=None, extension='image/gif'
extension='image/gif', ):
):
""" """
helper to encode the provided (binary) data into base64. helper to encode the provided (binary) data into base64.
@@ -2834,6 +2829,7 @@ class MARKMIN(XmlComponent):
def __str__(self): def __str__(self):
return self.xml() return self.xml()
def ASSIGNJS(**kargs): def ASSIGNJS(**kargs):
from gluon.serializers import json from gluon.serializers import json
s = "" s = ""