Merge branch 'list-comprehension' of git://github.com/jdufresne/django-debug-toolbar

* 'list-comprehension' of git://github.com/jdufresne/django-debug-toolbar:
  Replace uses of map with list comprehension or generator expressions

Author: matthiask

debug_toolbar/panels/sql/tracking.py

@@ -92,7 +92,7 @@ def _quote_params(self, params):
             return params
         if isinstance(params, dict):
             return {key: self._quote_expr(value) for key, value in params.items()}
-        return list(map(self._quote_expr, params))
+        return [self._quote_expr(p) for p in params]
 
     def _decode(self, param):
         try:
@@ -113,7 +113,7 @@ def _record(self, method, sql, params):
                 stacktrace = []
             _params = ''
             try:
-                _params = json.dumps(list(map(self._decode, params)))
+                _params = json.dumps([self._decode(p) for p in params])
             except Exception:
                 pass  # object not JSON serializable
 

debug_toolbar/utils.py

@@ -5,6 +5,7 @@
 import re
 import sys
 from importlib import import_module
+from itertools import chain
 
 import django
 from django.core.exceptions import ImproperlyConfigured
@@ -71,7 +72,7 @@ def tidy_stacktrace(stack):
 def render_stacktrace(trace):
     stacktrace = []
     for frame in trace:
-        params = map(escape, frame[0].rsplit(os.path.sep, 1) + list(frame[1:]))
+        params = (escape(v) for v in chain(frame[0].rsplit(os.path.sep, 1), frame[1:]))
         params_dict = {six.text_type(idx): v for idx, v in enumerate(params)}
         try:
             stacktrace.append('<span class="djdt-path">%(0)s/</span>'