diff options
Diffstat (limited to 'libbe/command/html.py')
| -rw-r--r-- | libbe/command/html.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libbe/command/html.py b/libbe/command/html.py index 3dfeb75..df87450 100644 --- a/libbe/command/html.py +++ b/libbe/command/html.py @@ -23,7 +23,7 @@ import codecs import email.utils -import htmlentitydefs +import html.entities import itertools import os import os.path @@ -97,7 +97,7 @@ class ServerApp (libbe.util.wsgi.WSGI_AppObject, filter_ = self._filters.get(bug_type, self._filters['active']) bugs = list(itertools.chain(*list( [bug for bug in bugdir if filter_(bug)] - for bugdir in self.bugdirs.values()))) + for bugdir in list(self.bugdirs.values())))) bugs.sort() if self.logger: self.logger.log( @@ -187,13 +187,13 @@ class ServerApp (libbe.util.wsgi.WSGI_AppObject, if time.time() > self._refresh: if self.logger: self.logger.log(self.log_level, 'refresh bugdirs') - for bugdir in self.bugdirs.values(): + for bugdir in list(self.bugdirs.values()): bugdir.load_all_bugs() self._refresh = time.time() + 60 def _truncated_bugdir_id(self, bugdir): return libbe.util.id._truncate( - bugdir.uuid, self.bugdirs.keys(), + bugdir.uuid, list(self.bugdirs.keys()), min_length=self.min_id_length) def _truncated_bug_id(self, bug): @@ -255,7 +255,7 @@ class ServerApp (libbe.util.wsgi.WSGI_AppObject, p = libbe.util.id.parse_user(bugdirs, long_id) except (libbe.util.id.MultipleIDMatches, libbe.util.id.NoIDMatches, - libbe.util.id.InvalidIDStructure), e: + libbe.util.id.InvalidIDStructure) as e: return '#%s#' % long_id # re-wrap failures if p['type'] == 'bugdir': return '#%s#' % long_id @@ -881,7 +881,7 @@ will exit after the dump without serving anything over the wire. def _write_default_template(self, template_dict, out_dir): out_dir = self._make_dir(out_dir) - for filename,text in template_dict.iteritems(): + for filename,text in template_dict.items(): self._write_file(text, [out_dir, filename]) def _write_static_pages(self, app, out_dir): @@ -904,7 +904,7 @@ will exit after the dump without serving anything over the wire. for url_,path_ in url_mappings: content = content.replace(url_, path_) self._write_file(content=content, path_array=[out_dir, path]) - for bugdir in app.bugdirs.values(): + for bugdir in list(app.bugdirs.values()): for bug in bugdir: bug_dir_url = app.bug_dir(bug=bug) segments = bug_dir_url.split('/') |