flake8

wireservice · Jan 30, 2016 · 0c42d1c · 0c42d1c
1 parent c589c3b
commit 0c42d1c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/csvkit/exceptions.py b/csvkit/exceptions.py
@@ -56,10 +56,6 @@ class CSVJSONException(CustomException):
     pass
 
 
-class NonUniqueKeyColumnException(CSVJSONException):
-    pass
-
-
 class InvalidValueForTypeException(CustomException):
     """
     Exception raised when a value can not be normalized to a specified type.

diff --git a/csvkit/utilities/csvjson.py b/csvkit/utilities/csvjson.py
@@ -13,7 +13,6 @@
 import six
 
 from csvkit.cli import CSVKitUtility, match_column_identifier
-from csvkit.exceptions import NonUniqueKeyColumnException
 
 
 class CSVJSON(CSVKitUtility):

diff --git a/tests/test_utilities/test_csvjson.py b/tests/test_utilities/test_csvjson.py
@@ -12,7 +12,6 @@
     import unittest
     from unittest.mock import patch
 
-from csvkit.exceptions import NonUniqueKeyColumnException
 from csvkit.utilities.csvjson import CSVJSON, launch_new_instance
 
 

diff --git a/tests/test_utilities/test_in2csv.py b/tests/test_utilities/test_in2csv.py
@@ -32,7 +32,7 @@ def test_launch_new_instance(self):
     def test_convert_csv(self):
         self.assertConverted('csv', 'examples/testfixed_converted.csv', 'examples/testfixed_converted.csv')
 
-    def test_convert_csv(self):
+    def test_convert_dbf(self):
         self.assertConverted('dbf', 'examples/testdbf.dbf', 'examples/testdbf_converted.csv')
 
     def test_convert_json(self):
@@ -53,7 +53,7 @@ def test_convert_xls_with_sheet(self):
     def test_convert_xlsx(self):
         self.assertConverted('xlsx', 'examples/test.xlsx', 'examples/testxlsx_converted.csv')
 
-    def test_convert_xlsx(self):
+    def test_convert_xlsx_with_sheet(self):
         self.assertConverted('xlsx', 'examples/sheets.xlsx', 'examples/testxlsx_converted.csv', ['--sheet', 'data'])
 
     def test_csv_no_headers(self):