fixing @ElDeveloper suggestions

qiita-spots · Jul 15, 2014 · f8147d8 · f8147d8
1 parent ce60f29
commit f8147d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/qiita_db/data.py b/qiita_db/data.py
@@ -265,7 +265,7 @@ def data_type(self, ret_id=False):
         Returns
         -------
         str or int
-            string value of data_type or data_type_id
+            string value of data_type or int if data_type_id
         """
         ret = "_id" if ret_id else ""
         conn_handler = SQLConnectionHandler()

diff --git a/qiita_db/test/test_data.py b/qiita_db/test/test_data.py
@@ -161,8 +161,6 @@ def test_create(self):
         obs = self.conn_handler.execute_fetchall(
             "SELECT * FROM qiita.preprocessed_data WHERE "
             "preprocessed_data_id=3")
-        # preprocessed_data_id, raw_data_id, preprocessed_params_tables,
-        # preprocessed_params_id
         exp = [[3, "preprocessed_sequence_illumina_params", 1, False, 2]]
         self.assertEqual(obs, exp)
 
@@ -194,7 +192,7 @@ def test_create(self):
         self.assertEqual(obs, exp)
 
     def test_create_data_type_only(self):
-            # Check that the returned object has the correct id
+        # Check that the returned object has the correct id
         obs = PreprocessedData.create(self.study, self.params_table,
                                       self.params_id, self.filepaths,
                                       data_type="18S")
@@ -204,8 +202,6 @@ def test_create_data_type_only(self):
         obs = self.conn_handler.execute_fetchall(
             "SELECT * FROM qiita.preprocessed_data WHERE "
             "preprocessed_data_id=3")
-        # preprocessed_data_id, raw_data_id, preprocessed_params_tables,
-        # preprocessed_params_id
         exp = [[3, "preprocessed_sequence_illumina_params", 1, False, 2]]
         self.assertEqual(obs, exp)