- TypedColumnReader now detects duplicate column names

- Moved to v2.4.1

Author: Alan Christie

src/python/pipelines_utils/TypedColumnReader.py

@@ -228,6 +228,10 @@ def _handle_hdr(self, hdr):
             if len(name) == 0:
                 raise ContentError(column_number, self._c_reader.line_num,
                                    cell, 'Column name is empty')
+            if name in self._column_names:
+                raise ContentError(column_number, self._c_reader.line_num,
+                                   name, 'Duplicate column name')
+
             if len(cell_parts) == 2:
                 column_type = cell_parts[1].lower()
                 if column_type not in CONVERTERS:

src/python/setup.py

@@ -22,7 +22,7 @@ def get_long_description():
 setup(
 
     name='im-pipelines-utils',
-    version='2.4.0',
+    version='2.4.1',
     author='Alan Christie',
     author_email='[email protected]',
     url='https://github.com/InformaticsMatters/pipelines-utils',

src/python/test/python2_3/pipelines_utils/test_TypedColumnReader.py

@@ -40,6 +40,29 @@ def test_basic_example_a_with_supplied_header(self):
         self.assertEqual(2, num_lines)
         csv_file.close()
 
+    def test_basic_example_a_with_duplicate_column_names(self):
+        """Test loading of a simple CSV file with a provided header
+        that contains duplicate names
+        """
+        test_file = os.path.join(DATA_DIR, 'TypedCsvReader.example.a-no-header.csv')
+        csv_file = open(test_file)
+        test_file = TypedColumnReader.TypedColumnReader(csv_file,
+                                                        column_sep=',',
+                                                        header='one,one,three,four')
+        num_lines = 0
+        got_exception = False
+        try:
+            for _ in test_file:
+                num_lines += 1
+        except TypedColumnReader.ContentError as e:
+            self.assertEqual(2, e.column)
+            self.assertEqual(0, e.row)
+            self.assertEqual('one', e.value)
+            got_exception = True
+        self.assertTrue(got_exception)
+        self.assertEqual(0, num_lines)
+        csv_file.close()
+
     def test_basic_example_a_gzip(self):
         """Test loading of a simple CSV file (gzipped)
         """
@@ -65,7 +88,7 @@ def test_basic_example_b_unknown_type(self):
                 num_lines += 1
         except TypedColumnReader.UnknownTypeError as e:
             self.assertEqual(4, e.column)
-            self.assertAlmostEqual('unknown-type', e.column_type)
+            self.assertEqual('unknown-type', e.column_type)
             got_exception = True
         self.assertTrue(got_exception)
         self.assertEqual(0, num_lines)
@@ -85,7 +108,7 @@ def test_basic_example_c_too_many_colons(self):
         except TypedColumnReader.ContentError as e:
             self.assertEqual(4, e.column)
             self.assertEqual(1, e.row)
-            self.assertAlmostEqual('four:unknown-type:too-many-colons', e.value)
+            self.assertEqual('four:unknown-type:too-many-colons', e.value)
             got_exception = True
         self.assertTrue(got_exception)
         self.assertEqual(0, num_lines)
@@ -105,8 +128,8 @@ def test_basic_example_d_wrong_type(self):
         except TypedColumnReader.ContentError as e:
             self.assertEqual(1, e.column)
             self.assertEqual(2, e.row)
-            self.assertAlmostEqual('A string', e.value)
-            self.assertAlmostEqual('Does not comply with column type', e.message)
+            self.assertEqual('A string', e.value)
+            self.assertEqual('Does not comply with column type', e.message)
             got_exception = True
         self.assertTrue(got_exception)
         self.assertEqual(0, num_lines)
@@ -138,7 +161,7 @@ def test_basic_example_d_too_many_values(self):
         except TypedColumnReader.ContentError as e:
             self.assertEqual(3, e.column)
             self.assertEqual(2, e.row)
-            self.assertAlmostEqual('Too many values', e.message)
+            self.assertEqual('Too many values', e.message)
             got_exception = True
         self.assertTrue(got_exception)
         self.assertEqual(0, num_lines)