Solving comments and pep8

Author: josenavas

qiita_db/metadata_template/util.py

@@ -397,17 +397,25 @@ def _parse_mapping_file(lines, strip_quotes=True, suppress_stripping=False):
     if strip_quotes:
         if suppress_stripping:
             # remove quotes but not spaces
-            strip_f = lambda x: x.replace('"', '')
+
+            def strip_f(x):
+                return x.replace('"', '')
         else:
             # remove quotes and spaces
-            strip_f = lambda x: x.replace('"', '').strip()
+
+            def strip_f(x):
+                return x.replace('"', '').strip()
     else:
         if suppress_stripping:
             # don't remove quotes or spaces
-            strip_f = lambda x: x
+
+            def strip_f(x):
+                return x
         else:
             # remove spaces but not quotes
-            strip_f = lambda x: x.strip()
+
+            def strip_f(x):
+                return x.strip()
 
     # Create lists to store the results
     mapping_data = []

qiita_pet/handlers/study_handlers/description_handlers.py

@@ -31,6 +31,7 @@
                                  QiitaDBDuplicateHeaderError, QiitaDBError)
 from qiita_ware.metadata_pipeline import (
     create_templates_from_qiime_mapping_file)
+from qiita_ware.exceptions import QiitaWareError
 from qiita_pet.handlers.base_handlers import BaseHandler
 from qiita_pet.handlers.util import check_access
 from qiita_pet.handlers.study_handlers.listing_handlers import (
@@ -199,7 +200,7 @@ def process_sample_template(self, study, user, callback):
         except (TypeError, QiitaDBColumnError, QiitaDBExecutionError,
                 QiitaDBDuplicateError, IOError, ValueError, KeyError,
                 CParserError, QiitaDBDuplicateHeaderError,
-                QiitaDBError) as e:
+                QiitaDBError, QiitaWareError) as e:
             # Some error occurred while processing the sample template
             # Show the error to the user so they can fix the template
             error_msg = ('parsing the QIIME mapping file'