flake8: apply E1 rules
This commit is contained in:
Yuming Zhu
parent
450f9249cd
commit
ce1f9928af
30 changed files with 958 additions and 958 deletions
|
|
@ -191,7 +191,7 @@ def _construct_url(environ, page):
|
|||
host = environ['SERVER_NAME']
|
||||
url_scheme = environ['wsgi.url_scheme']
|
||||
if (url_scheme == 'https' and port == '443') or \
|
||||
(url_scheme == 'http' and port == '80'):
|
||||
(url_scheme == 'http' and port == '80'):
|
||||
return "%s://%s%s" % (url_scheme, host, page)
|
||||
return "%s://%s:%s%s" % (url_scheme, host, port, page)
|
||||
|
||||
|
|
@ -683,7 +683,7 @@ def taskinfo(environ, taskID):
|
|||
values['excClass'] = None
|
||||
if task['method'] == 'buildContainer' and 'koji_builds' in result:
|
||||
values['taskBuilds'] = [
|
||||
server.getBuild(int(buildID)) for buildID in result['koji_builds']]
|
||||
server.getBuild(int(buildID)) for buildID in result['koji_builds']]
|
||||
else:
|
||||
values['result'] = None
|
||||
values['excClass'] = None
|
||||
|
|
@ -819,7 +819,7 @@ def tags(environ, start=None, order=None, childID=None):
|
|||
values['order'] = order
|
||||
|
||||
kojiweb.util.paginateMethod(server, values, 'listTags', kw=None,
|
||||
start=start, dataName='tags', prefix='tag', order=order)
|
||||
start=start, dataName='tags', prefix='tag', order=order)
|
||||
|
||||
if environ['koji.currentUser']:
|
||||
values['perms'] = server.getUserPerms(environ['koji.currentUser']['id'])
|
||||
|
|
@ -859,8 +859,8 @@ def packages(environ, tagID=None, userID=None, order='package_name', start=None,
|
|||
values['inherited'] = inherited
|
||||
|
||||
kojiweb.util.paginateMethod(server, values, 'listPackages',
|
||||
kw={'tagID': tagID, 'userID': userID, 'prefix': prefix, 'inherited': bool(inherited)},
|
||||
start=start, dataName='packages', prefix='package', order=order)
|
||||
kw={'tagID': tagID, 'userID': userID, 'prefix': prefix, 'inherited': bool(inherited)},
|
||||
start=start, dataName='packages', prefix='package', order=order)
|
||||
|
||||
values['chars'] = _PREFIX_CHARS
|
||||
|
||||
|
|
@ -1652,8 +1652,8 @@ def channelinfo(environ, channelID):
|
|||
|
||||
states = [koji.TASK_STATES[s] for s in ('FREE', 'OPEN', 'ASSIGNED')]
|
||||
values['taskCount'] = \
|
||||
server.listTasks(opts={'channel_id': channelID, 'state': states},
|
||||
queryOpts={'countOnly': True})
|
||||
server.listTasks(opts={'channel_id': channelID, 'state': states},
|
||||
queryOpts={'countOnly': True})
|
||||
|
||||
hosts = server.listHosts(channelID=channelID)
|
||||
hosts.sort(key=_sortbyname)
|
||||
|
|
@ -1756,7 +1756,7 @@ def archivelist(environ, type, buildrootID=None, imageID=None, start=None, order
|
|||
start=start, dataName='archives', prefix='archive', order=order)
|
||||
elif type == 'built':
|
||||
kojiweb.util.paginateMethod(server, values, 'listArchives', kw={'buildrootID': buildroot['id']},
|
||||
start=start, dataName='archives', prefix='archive', order=order)
|
||||
start=start, dataName='archives', prefix='archive', order=order)
|
||||
else:
|
||||
raise koji.GenericError('unrecognized type of archivelist')
|
||||
elif imageID is not None:
|
||||
|
|
|
|||
|
|
@ -551,8 +551,8 @@ def escapeHTML(value):
|
|||
|
||||
value = koji.fixEncoding(value)
|
||||
return value.replace('&', '&').\
|
||||
replace('<', '<').\
|
||||
replace('>', '>')
|
||||
replace('<', '<').\
|
||||
replace('>', '>')
|
||||
|
||||
def authToken(template, first=False, form=False):
|
||||
"""Return the current authToken if it exists.
|
||||
|
|
@ -644,7 +644,7 @@ class TaskResultFragment(object):
|
|||
- empty_str_placeholder
|
||||
"""
|
||||
def __init__(self, text='', size=None, need_escape=None, begin_tag='',
|
||||
end_tag='', composer=None, empty_str_placeholder=None):
|
||||
end_tag='', composer=None, empty_str_placeholder=None):
|
||||
self.text = text
|
||||
if size is None:
|
||||
self.size = len(text)
|
||||
|
|
@ -689,7 +689,7 @@ class TaskResultLine(object):
|
|||
- composer
|
||||
"""
|
||||
def __init__(self, fragments=None, need_escape=None, begin_tag='',
|
||||
end_tag='<br />', composer=None):
|
||||
end_tag='<br />', composer=None):
|
||||
if fragments is None:
|
||||
self.fragments = []
|
||||
else:
|
||||
|
|
@ -746,18 +746,18 @@ def _parse_value(key, value, sep=', '):
|
|||
_str = sep.join([str(val) for val in value])
|
||||
elif isinstance(value, dict):
|
||||
_str = sep.join(['%s=%s' % ((n == '' and "''" or n), v)
|
||||
for n, v in value.items()])
|
||||
for n, v in value.items()])
|
||||
else:
|
||||
_str = str(value)
|
||||
if _str is None:
|
||||
_str = ''
|
||||
|
||||
return TaskResultFragment(text=_str, need_escape=need_escape,
|
||||
begin_tag=begin_tag, end_tag=end_tag)
|
||||
begin_tag=begin_tag, end_tag=end_tag)
|
||||
|
||||
def task_result_to_html(result=None, exc_class=None,
|
||||
max_abbr_lines=None, max_abbr_len=None,
|
||||
abbr_postscript=None):
|
||||
max_abbr_lines=None, max_abbr_len=None,
|
||||
abbr_postscript=None):
|
||||
"""convert the result to a mutiple lines HTML fragment
|
||||
|
||||
Args:
|
||||
|
|
@ -801,7 +801,7 @@ def task_result_to_html(result=None, exc_class=None,
|
|||
|
||||
def _parse_properties(props):
|
||||
return ', '.join([v is not None and '%s=%s' % (n, v) or str(n)
|
||||
for n, v in props.items()])
|
||||
for n, v in props.items()])
|
||||
|
||||
if exc_class:
|
||||
if hasattr(result, 'faultString'):
|
||||
|
|
@ -810,7 +810,7 @@ def task_result_to_html(result=None, exc_class=None,
|
|||
_str = "%s: %s" % (exc_class.__name__, str(result))
|
||||
fragment = TaskResultFragment(text=_str, need_escape=True)
|
||||
line = TaskResultLine(fragments=[fragment],
|
||||
begin_tag='<pre>', end_tag='</pre>')
|
||||
begin_tag='<pre>', end_tag='</pre>')
|
||||
lines.append(line)
|
||||
elif isinstance(result, dict):
|
||||
|
||||
|
|
@ -821,8 +821,8 @@ def task_result_to_html(result=None, exc_class=None,
|
|||
val_fragment = line.fragments[1]
|
||||
if length is None:
|
||||
return '%s%s = %s%s%s' % (line.begin_tag, key_fragment.composer(),
|
||||
val_fragment.composer(), postscript,
|
||||
line.end_tag)
|
||||
val_fragment.composer(), postscript,
|
||||
line.end_tag)
|
||||
first_part_len = len('%s = ') + key_fragment.size
|
||||
remainder_len = length - first_part_len
|
||||
if remainder_len < 0: remainder_len = 0
|
||||
|
|
@ -840,7 +840,7 @@ def task_result_to_html(result=None, exc_class=None,
|
|||
val_fragment = _parse_value(k, v)
|
||||
key_fragment = TaskResultFragment(text=k, need_escape=True)
|
||||
line = TaskResultLine(fragments=[key_fragment, val_fragment],
|
||||
need_escape=False, composer=composer)
|
||||
need_escape=False, composer=composer)
|
||||
lines.append(line)
|
||||
else:
|
||||
if result is not None:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue