record.FILTER is now always a list

jamescasbon · Sep 10, 2012 · 27ee8e3 · 27ee8e3
1 parent ae7f9d0
commit 27ee8e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/vcf/model.py b/vcf/model.py
@@ -151,13 +151,7 @@ def add_format(self, fmt):
         self.FORMAT = self.FORMAT + ':' + fmt
 
     def add_filter(self, flt):
-        if self.FILTER is None \
-        or self.FILTER == 'PASS'\
-        or self.FILTER == '.':
-            self.FILTER = ''
-        else:
-            self.FILTER = self.FILTER + ';'
-        self.FILTER = self.FILTER + flt
+        self.FILTER.append(flt)
 
     def add_info(self, info, value=True):
         self.INFO[info] = value

diff --git a/vcf/parser.py b/vcf/parser.py
@@ -458,9 +458,11 @@ def next(self):
             except ValueError:
                 qual = None
 
-        filt = row[6].split(';') if ';' in row[6] else row[6]
-        if filt == 'PASS':
-            filt = None
+        filt = row[6]
+        if filt == 'PASS' or filt == '.':
+            filt = []
+        else:
+            filt = filt.split(';')
         info = self._parse_info(row[7])
 
         try: