Merge pull request #149 from ericlaw1979/master

Correct load_domains behavior for skipping rows
18F · Oct 30, 2017 · ca1e48b · ca1e48b
2 parents 9afd98b + 68270d8
commit ca1e48b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/scanners/utils.py b/scanners/utils.py
@@ -315,11 +315,16 @@ def load_domains(domain_csv, whole_rows=False):
     domains = []
     with open(domain_csv, newline='') as csvfile:
         for row in csv.reader(csvfile):
-            if (not row[0]) or (row[0].lower().startswith("domain")):
+            # Skip empty rows.
+            if (not row) or (not row[0].strip()):
                 continue
 
             row[0] = row[0].lower()
 
+            # Skip any header row.
+            if (not domains) and (row[0].startswith("domain")):
+                continue
+
             if whole_rows:
                 domains.append(row)
             else: