Misc cleanup

Fix lint
Pass kwargs straight through to fn that uses them

Author: Steve Lamb

djqscsv/_csql.py

@@ -6,12 +6,14 @@
 This module may later be officially supported.
 """
 
+
 def _transform(dataset, arg):
     if isinstance(arg, str):
         return (dataset[0].index(arg), arg)
     elif isinstance(arg, tuple):
         return (dataset[0].index(arg[0]), arg[1])
 
+
 def SELECT(dataset, *args):
     # turn the args into indices based on the first row
     index_headers = [_transform(dataset, arg) for arg in args]
@@ -25,10 +27,12 @@ def SELECT(dataset, *args):
                 for datarow in dataset[1:]]
     return results
 
+
 def EXCLUDE(dataset, *args):
     antiargs = [value for index, value in enumerate(dataset[0])
-               if not index in args and not value in args]
+                if index not in args and value not in args]
     return SELECT(dataset, *antiargs)
 
+
 def AS(field, display_name):
     return (field, display_name)

djqscsv/djqscsv.py

@@ -9,7 +9,7 @@
 from django.conf import settings
 if not settings.configured:
     # required to import ValuesQuerySet
-    settings.configure() # pragma: no cover
+    settings.configure()  # pragma: no cover
 
 from django.db.models.query import ValuesQuerySet
 
@@ -23,8 +23,7 @@ class CSVException(Exception):
 
 
 def render_to_csv_response(queryset, filename=None, append_datestamp=False,
-                           field_header_map=None, use_verbose_names=True,
-                           field_order=None):
+                           **kwargs):
     """
     provides the boilerplate for making a CSV http response.
     takes a filename or generates one from the queryset's model.
@@ -41,7 +40,7 @@ def render_to_csv_response(queryset, filename=None, append_datestamp=False,
     response['Content-Disposition'] = 'attachment; filename=%s;' % filename
     response['Cache-Control'] = 'no-cache'
 
-    write_csv(queryset, response, field_header_map, use_verbose_names, field_order)
+    write_csv(queryset, response, **kwargs)
 
     return response
 
@@ -83,7 +82,6 @@ def write_csv(queryset, file_obj, field_header_map=None,
                        [field for field in field_names
                         if field not in field_order])
 
-
     writer = csv.DictWriter(file_obj, field_names)
 
     # verbose_name defaults to the raw field name, so in either case