diff --git a/debug_toolbar/panels/sql/panel.py b/debug_toolbar/panels/sql/panel.py index afc2d2785..94f22ff2b 100644 --- a/debug_toolbar/panels/sql/panel.py +++ b/debug_toolbar/panels/sql/panel.py @@ -55,7 +55,7 @@ class SQLPanel(Panel): """ def __init__(self, *args, **kwargs): super(SQLPanel, self).__init__(*args, **kwargs) - self._offset = dict((k, len(connections[k].queries)) for k in connections) + self._offset = {k: len(connections[k].queries) for k in connections} self._sql_time = 0 self._num_queries = 0 self._queries = [] @@ -212,14 +212,14 @@ def generate_stats(self, request, response): # Queries are duplicates only if there's as least 2 of them. # Also, to hide queries, we need to give all the duplicate groups an id query_colors = contrasting_color_generator() - query_duplicates = dict( - (alias, dict( - (query, (duplicate_count, next(query_colors))) + query_duplicates = { + alias: { + query: (duplicate_count, next(query_colors)) for query, duplicate_count in queries.items() if duplicate_count >= 2 - )) + } for alias, queries in query_duplicates.items() - ) + } for alias, query in self._queries: try: diff --git a/debug_toolbar/panels/sql/tracking.py b/debug_toolbar/panels/sql/tracking.py index 46158cc90..c619bba9a 100644 --- a/debug_toolbar/panels/sql/tracking.py +++ b/debug_toolbar/panels/sql/tracking.py @@ -91,8 +91,7 @@ def _quote_params(self, params): if not params: return params if isinstance(params, dict): - return dict((key, self._quote_expr(value)) - for key, value in params.items()) + return {key: self._quote_expr(value) for key, value in params.items()} return list(map(self._quote_expr, params)) def _decode(self, param): diff --git a/debug_toolbar/utils.py b/debug_toolbar/utils.py index 88138bc19..8b66a446c 100644 --- a/debug_toolbar/utils.py +++ b/debug_toolbar/utils.py @@ -72,7 +72,7 @@ def render_stacktrace(trace): stacktrace = [] for frame in trace: params = map(escape, frame[0].rsplit(os.path.sep, 1) + list(frame[1:])) - params_dict = dict((six.text_type(idx), v) for idx, v in enumerate(params)) + params_dict = {six.text_type(idx): v for idx, v in enumerate(params)} try: stacktrace.append('%(0)s/' '%(1)s'