Merge pull request django-import-export#417 from jnns/master

Make line errors more readable
freelancersunion · Mar 2, 2016 · 0f86101 · 0f86101
2 parents 034330a + 979c0cb
commit 0f86101
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/import_export/resources.py b/import_export/resources.py
@@ -342,7 +342,7 @@ def import_data(self, dataset, dry_run=False, raise_errors=False,
         except Exception as e:
             logging.exception(e)
             tb_info = traceback.format_exc()
-            result.base_errors.append(Error(repr(e), tb_info))
+            result.base_errors.append(Error(e, tb_info))
             if raise_errors:
                 if use_transactions:
                     savepoint_rollback(sp1)

diff --git a/import_export/templates/admin/import_export/import.html b/import_export/templates/admin/import_export/import.html
@@ -28,12 +28,7 @@ <h1>{% trans "Import" %}</h1>
 
     <p>
       {% trans "This importer will import the following fields: " %}
-      {% for f in fields  %}
-        {% if forloop.counter0 %}
-        ,
-        {% endif %}
-        <code>{{ f }}</code>
-      {% endfor %}
+      <code>{{ fields|join:", " }}</code>
     </p>
 
     <fieldset class="module aligned">
@@ -73,7 +68,7 @@ <h2>{% trans "Errors" %}</h2>
         {% for error in errors %}
           <li>
             {% trans "Line number" %}: {{ line }} - {{ error.error }}
-            <div>{{ error.row }}</div>
+            <div><code>{{ error.row.values|join:", " }}</code></div>
             <div class="traceback">{{ error.traceback|linebreaks }}</div>
           </li>
         {% endfor %}