Mercurial Repository: p/roundup/code: roundup/cgi/templating.py comparison

comparison roundup/cgi/templating.py @ 7026:d7f0eab25305

flake8 E231 missing whitespace after ',' or ':'

author	John Rouillard <rouilj@ieee.org>
date	Sun, 09 Oct 2022 17:51:42 -0400
parents	66149a18f09e
children	ab5e1fd920a1

comparison

equal deleted inserted replaced

-:66149a18f09e
+:d7f0eab25305
 <input required ..> not <input required="required" ...>
 The latter is xhtml. Recognize booleans by:
 value is None
 Code can use None to indicate a pure boolean.
 '''
-return ' '.join(['%s="%s"'%(k,html_escape(str(v), True))
+return ' '.join(['%s="%s"'%(k, html_escape(str(v), True))
 if v is not None else '%s'%(k)
-for k,v in sorted(attrs.items())])
+for k, v in sorted(attrs.items())])
 def xhtml_cgi_escape_attrs(**attrs):
 ''' Boolean attributes like 'disabled', 'required'
 are represented with a value that is the same as
 <input required="required" ...> not <input required ..>
 The latter is html4 or 5. Recognize booleans by:
 value is None
 Code can use None to indicate a pure boolean.
 '''
-return ' '.join(['%s="%s"'%(k,html_escape(str(v), True))
+return ' '.join(['%s="%s"'%(k, html_escape(str(v), True))
-if v is not None else '%s="%s"'%(k,k)
+if v is not None else '%s="%s"'%(k, k)
-for k,v in sorted(attrs.items())])
+for k, v in sorted(attrs.items())])
 def input_html4(**attrs):
 """Generate an 'input' (html4) element with given attributes"""
 _set_input_default_args(attrs)
 if isinstance(prop, klass):
 value = prop.get_default_value()
 l.append(htmlklass(self._client, self._classname, '',
 prop, name, value, self._anonymous))
 if sort:
-l.sort(key=lambda a:a._name)
+l.sort(key=lambda a: a._name)
 return l
 def list(self, sort_on=None):
 """ List all items in this class.
 """
 timezone = self._db.getUserTimezone()
 l = []
 current = {}
 comments = {}
 for id, evt_date, user, action, args in history:
-date_s = str(evt_date.local(timezone)).replace("."," ")
+date_s = str(evt_date.local(timezone)).replace(".", " ")
 arg_s = ''
 if action in ['link', 'unlink'] and isinstance(args, tuple):
 if len(args) == 3:
 linkcl, linkid, key = args
 arg_s += '<a rel="nofollow noopener" href="%s%s">%s%s %s</a>'%(linkcl, linkid,
 return '`%s <%s>`_'%(s, s)
 elif match.group('email'):
 s = match.group('email')
 return '`%s <mailto:%s>`_'%(s, s)
 elif len(match.group('id')) < 10:
-return self._hyper_repl_item(match,'`%(item)s <%(cls)s%(id)s>`_')
+return self._hyper_repl_item(match, '`%(item)s <%(cls)s%(id)s>`_')
 else:
 # just return the matched text
 return match.group(0)
 def _hyper_repl_markdown(self, match):
 if end < len(match.string):
 suffix = match.string[end]
 if (prefix, suffix) in {('[', ']')}:
 if match.string[end+1] == '(':  # find following (
 return match.group(0)
-if (prefix, suffix) in {('(',')')}:
+if (prefix, suffix) in {('(', ')')}:
 if match.string[start-1] == ']':
 return match.group(0)
-return self._hyper_repl_item(match,'[%(item)s](%(cls)s%(id)s)')
+return self._hyper_repl_item(match, '[%(item)s](%(cls)s%(id)s)')
 else:
 # just return the matched text
 return match.group(0)
 def url_quote(self):
 return self._('[hidden]')
 s = self.plain(escape=escape, hyperlink=hyperlink)
 if not StructuredText:
 return s
-return StructuredText(s,level=1,header=0)
+return StructuredText(s, level=1, header=0)
 def rst(self, hyperlink=1):
 """ Render the value of the property as ReStructuredText.
 This requires docutils to be installed separately.
 "data-height": height
 }
 return ('<a class="classhelp" %s href="javascript:help_window('
 "'%s?@template=calendar&amp;property=%s&amp;form=%s%s', %d, %d)"
-'">%s</a>'%(self.cgi_escape_attrs(**data_attr),self._classname, self._name, form, date, width,
+'">%s</a>'%(self.cgi_escape_attrs(**data_attr),
-height, label))
+self._classname, self._name, form, date, width,
+height, label))
 class IntervalHTMLProperty(HTMLProperty):
 def __init__(self, client, classname, nodeid, prop, name, value,
 anonymous=0):
 """
 # use 2 if NoneFirst is False to sort None last
 # 0 to sort to sort None first
 # 1 is used to sort the integer values.
-NoneCode = (2,0)[NoneFirst]
+NoneCode = (2, 0)[NoneFirst]
 value = list(self.__iter__())
 if not value:
 # return empty list, nothing to sort.
 (hyperdb.Multilink, MultilinkHTMLProperty),
 ]
 def register_propclass(prop, cls):
-for index,propclass in enumerate(propclasses):
+for index, propclass in enumerate(propclasses):
 p, c = propclass
 if prop == p:
 propclasses[index] = (prop, cls)
 break
 else:
 def __str__(self):
 d = {}
 d.update(self.__dict__)
 f = ''
 for k in self.form.keys():
-f += '\n      %r=%r'%(k,handleListCGIValue(self.form[k]))
+f += '\n      %r=%r'%(k, handleListCGIValue(self.form[k]))
 d['form'] = f
 e = ''
-for k,v in self.env.items():
+for k, v in self.env.items():
 e += '\n     %r=%r'%(k, v)
 d['env'] = e
 return """
 form: %(form)s
 base: %(base)r
 add(sc+'group', ','.join(val))
 if filter and self.filter:
 add(sc+'filter', ','.join(self.filter))
 if self.classname and filterspec:
 cls = self.client.db.getclass(self.classname)
-for k,v in self.filterspec.items():
+for k, v in self.filterspec.items():
 if k in exclude:
 continue
 if isinstance(v, list):
 # id's are stored as strings but should be treated
 # as integers in lists.
 dispname otherwise the parameter will be omitted
 from the url.
 """
 q = urllib_.quote
 sc = self.special_char
-l = ['%s=%s'%(k,is_us(v) and q(v) or v)
+l = ['%s=%s'%(k, is_us(v) and q(v) or v)
-for k,v in args.items() if v is not None]
+for k, v in args.items() if v is not None]
 # pull out the special values (prefixed by @ or :)
 specials = {}
 for key in args.keys():
 if key[0] in '@:':
 specials[key[1:]] = args[key]
 l.append(sc+'startwith=%s'%self.startwith)
 # finally, the remainder of the filter args in the request
 if self.classname and self.filterspec:
 cls = self.client.db.getclass(self.classname)
-for k,v in self.filterspec.items():
+for k, v in self.filterspec.items():
 if k not in args:
 if isinstance(v, list):
 prop = cls.get_transitive_prop(k)
 if k != 'id' and isinstance(prop, hyperdb.String):
 l.append('%s=%s'%(k, '%20'.join([q(i) for i in v])))
 function help_window(helpurl, width, height) {
 HelpWin = window.open('%s' + helpurl, 'RoundupHelpWindow', 'scrollbars=yes,resizable=yes,toolbar=no,height='+height+',width='+width);
 HelpWin.focus ()
 }
 </script>
-"""%(self._client.client_nonce,self.base)
+"""%(self._client.client_nonce, self.base)
 def batch(self, permission='View'):
 """ Return a batch object for results from the "current search"
 """
 check = self._client.db.security.hasPermission

Mercurial > p > roundup > code

comparison roundup/cgi/templating.py @ 7026:d7f0eab25305