remove xlsx

.coveragerc

@@ -1,2 +1,10 @@
 [run]
 source = xlrd,scripts,tests
+
+[report]
+exclude_lines =
+  # the original exclude
+  pragma: no cover
+
+  # debug stuff
+  if DEBUG:

tests/base.py → tests/helpers.py

@@ -1,5 +1,5 @@
 import os
 
 
-def from_this_dir(filename):
-    return os.path.join(os.path.dirname(os.path.abspath(__file__)), filename)
+def from_sample(filename):
+    return os.path.join(os.path.dirname(os.path.abspath(__file__)), 'samples', filename)

tests/samples/sample.txt

@@ -0,0 +1 @@
+This is a text file.

tests/test_cell.py

@@ -5,13 +5,13 @@
 import xlrd
 from xlrd.timemachine import UNICODE_LITERAL
 
-from .base import from_this_dir
+from .helpers import from_sample
 
 
 class TestCell(unittest.TestCase):
 
     def setUp(self):
-        self.book = xlrd.open_workbook(from_this_dir('profiles.xls'), formatting_info=True)
+        self.book = xlrd.open_workbook(from_sample('profiles.xls'), formatting_info=True)
         self.sheet = self.book.sheet_by_name('PROFILEDEF')
 
     def test_empty_cell(self):
@@ -43,31 +43,8 @@ def test_calculated_cell(self):
         self.assertTrue(cell.xf_index > 0)
 
     def test_merged_cells(self):
-        book = xlrd.open_workbook(from_this_dir('xf_class.xls'), formatting_info=True)
+        book = xlrd.open_workbook(from_sample('xf_class.xls'), formatting_info=True)
         sheet3 = book.sheet_by_name('table2')
         row_lo, row_hi, col_lo, col_hi = sheet3.merged_cells[0]
         self.assertEqual(sheet3.cell(row_lo, col_lo).value, 'MERGED')
         self.assertEqual((row_lo, row_hi, col_lo, col_hi), (3, 7, 2, 5))
-
-    def test_merged_cells_xlsx(self):
-        book = xlrd.open_workbook(from_this_dir('merged_cells.xlsx'))
-
-        sheet1 = book.sheet_by_name('Sheet1')
-        expected = []
-        got = sheet1.merged_cells
-        self.assertEqual(expected, got)
-
-        sheet2 = book.sheet_by_name('Sheet2')
-        expected = [(0, 1, 0, 2)]
-        got = sheet2.merged_cells
-        self.assertEqual(expected, got)
-
-        sheet3 = book.sheet_by_name('Sheet3')
-        expected = [(0, 1, 0, 2), (0, 1, 2, 4), (1, 4, 0, 2), (1, 9, 2, 4)]
-        got = sheet3.merged_cells
-        self.assertEqual(expected, got)
-
-        sheet4 = book.sheet_by_name('Sheet4')
-        expected = [(0, 1, 0, 2), (2, 20, 0, 1), (1, 6, 2, 5)]
-        got = sheet4.merged_cells
-        self.assertEqual(expected, got)

tests/test_formats.py

@@ -6,7 +6,7 @@
 
 import xlrd
 
-from .base import from_this_dir
+from .helpers import from_sample
 
 if sys.version_info[0] >= 3:
     def u(s): return s
@@ -18,7 +18,7 @@ def u(s):
 class TestCellContent(TestCase):
 
     def setUp(self):
-        self.book = xlrd.open_workbook(from_this_dir('Formate.xls'), formatting_info=True)
+        self.book = xlrd.open_workbook(from_sample('Formate.xls'), formatting_info=True)
         self.sheet = self.book.sheet_by_name(u('Blätt1'))
 
     def test_text_cells(self):

tests/test_formulas.py

@@ -5,7 +5,7 @@
 
 import xlrd
 
-from .base import from_this_dir
+from .helpers import from_sample
 
 try:
     ascii
@@ -20,7 +20,7 @@ def ascii(s):
 class TestFormulas(TestCase):
 
     def setUp(self):
-        book = xlrd.open_workbook(from_this_dir('formula_test_sjmachin.xls'))
+        book = xlrd.open_workbook(from_sample('formula_test_sjmachin.xls'))
         self.sheet = book.sheet_by_index(0)
 
     def get_value(self, col, row):
@@ -56,7 +56,7 @@ def test_cell_B8(self):
 class TestNameFormulas(TestCase):
 
     def setUp(self):
-        book = xlrd.open_workbook(from_this_dir('formula_test_names.xls'))
+        book = xlrd.open_workbook(from_sample('formula_test_names.xls'))
         self.sheet = book.sheet_by_index(0)
 
     def get_value(self, col, row):

tests/test_ignore_workbook_corruption_error.py

@@ -2,14 +2,14 @@
 
 import xlrd
 
-from .base import from_this_dir
+from .helpers import from_sample
 
 
 class TestIgnoreWorkbookCorruption(TestCase):
 
     def test_not_corrupted(self):
         with self.assertRaises(Exception) as context:
-            xlrd.open_workbook(from_this_dir('corrupted_error.xls'))
+            xlrd.open_workbook(from_sample('corrupted_error.xls'))
         self.assertTrue('Workbook corruption' in str(context.exception))
 
-        xlrd.open_workbook(from_this_dir('corrupted_error.xls'), ignore_workbook_corruption=True)
+        xlrd.open_workbook(from_sample('corrupted_error.xls'), ignore_workbook_corruption=True)

tests/test_inspect.py

@@ -0,0 +1,32 @@
+from xlrd import inspect_format
+
+from .helpers import from_sample
+
+
+def test_xlsx():
+    assert inspect_format(from_sample('sample.xlsx')) == 'xlsx'
+
+
+def test_xlsb():
+    assert inspect_format(from_sample('sample.xlsb')) == 'xlsb'
+
+
+def test_ods():
+    assert inspect_format(from_sample('sample.ods')) == 'ods'
+
+
+def test_zip():
+    assert inspect_format(from_sample('sample.zip')) == 'zip'
+
+
+def test_xls():
+    assert inspect_format(from_sample('namesdemo.xls')) == 'xls'
+
+
+def test_content():
+    with open(from_sample('sample.xlsx'), 'rb') as source:
+        assert inspect_format(content=source.read()) == 'xlsx'
+
+
+def test_unknown():
+    assert inspect_format(from_sample('sample.txt')) is None

tests/test_missing_records.py

@@ -3,13 +3,13 @@
 from xlrd import open_workbook
 from xlrd.biffh import XL_CELL_TEXT
 
-from .base import from_this_dir
+from .helpers import from_sample
 
 
 class TestMissingRecords(TestCase):
 
     def setUp(self):
-        path = from_this_dir('biff4_no_format_no_window2.xls')
+        path = from_sample('biff4_no_format_no_window2.xls')
         self.book = open_workbook(path)
         self.sheet = self.book.sheet_by_index(0)
 

tests/test_open_workbook.py

@@ -3,53 +3,34 @@
 import tempfile
 from unittest import TestCase
 
-from xlrd import open_workbook
+import pytest
 
-from .base import from_this_dir
+from xlrd import open_workbook, XLRDError
 
+from .helpers import from_sample
 
-class TestOpen(TestCase):
+
+class TestOpen(object):
     # test different uses of open_workbook
 
     def test_names_demo(self):
         # For now, we just check this doesn't raise an error.
-        open_workbook(
-            from_this_dir(from_this_dir('namesdemo.xls')),
-        )
-
-    def test_tilde_path_expansion(self):
-        with tempfile.NamedTemporaryFile(suffix='.xlsx', dir=os.path.expanduser('~')) as fp:
-            shutil.copyfile(from_this_dir('text_bar.xlsx'), fp.name)
-            # For now, we just check this doesn't raise an error.
-            open_workbook(os.path.join('~', os.path.basename(fp.name)))
+        open_workbook(from_sample('namesdemo.xls'))
 
     def test_ragged_rows_tidied_with_formatting(self):
         # For now, we just check this doesn't raise an error.
-        open_workbook(from_this_dir('issue20.xls'),
+        open_workbook(from_sample('issue20.xls'),
                       formatting_info=True)
 
     def test_BYTES_X00(self):
         # For now, we just check this doesn't raise an error.
-        open_workbook(from_this_dir('picture_in_cell.xls'),
+        open_workbook(from_sample('picture_in_cell.xls'),
                       formatting_info=True)
 
-    def test_xlsx_simple(self):
-        # For now, we just check this doesn't raise an error.
-        open_workbook(from_this_dir('text_bar.xlsx'))
-        # we should make assertions here that data has been
-        # correctly processed.
-
-    def test_xlsx(self):
-        # For now, we just check this doesn't raise an error.
-        open_workbook(from_this_dir('reveng1.xlsx'))
-        # we should make assertions here that data has been
-        # correctly processed.
-
-
-    def test_err_cell_empty(self):
-        # For cell with type "e" (error) but without inner 'val' tags
-        open_workbook(from_this_dir('err_cell_empty.xlsx'))
+    def test_open_xlsx(self):
+        with pytest.raises(XLRDError, match='Excel xlsx file; not supported'):
+            open_workbook(from_sample('sample.xlsx'))
 
-    def test_xlsx_lower_case_cellnames(self):
-        # Check if it opens with lower cell names
-        open_workbook(from_this_dir('test_lower_case_cellnames.xlsx'))
+    def test_open_unknown(self):
+        with pytest.raises(XLRDError, match="Unsupported format, or corrupt file"):
+            open_workbook(from_sample('sample.txt'))

tests/test_sheet.py

@@ -6,7 +6,7 @@
 import xlrd
 from xlrd.timemachine import xrange
 
-from .base import from_this_dir
+from .helpers import from_sample
 
 SHEETINDEX = 0
 NROWS = 15
@@ -22,7 +22,7 @@ class TestSheet(TestCase):
                   'AXISDATUMLEVELS', 'PROFILELEVELS']
 
     def setUp(self):
-        self.book = xlrd.open_workbook(from_this_dir('profiles.xls'), formatting_info=True)
+        self.book = xlrd.open_workbook(from_sample('profiles.xls'), formatting_info=True)
 
     def check_sheet_function(self, function):
         self.assertTrue(function(0, 0))
@@ -151,19 +151,10 @@ def test_row_values(self):
 class TestSheetRagged(TestCase):
 
     def test_read_ragged(self):
-        book = xlrd.open_workbook(from_this_dir('ragged.xls'), ragged_rows=True)
+        book = xlrd.open_workbook(from_sample('ragged.xls'), ragged_rows=True)
         sheet = book.sheet_by_index(0)
         self.assertEqual(sheet.row_len(0), 3)
         self.assertEqual(sheet.row_len(1), 2)
         self.assertEqual(sheet.row_len(2), 1)
         self.assertEqual(sheet.row_len(3), 4)
         self.assertEqual(sheet.row_len(4), 4)
-
-
-class TestMergedCells(TestCase):
-
-    def test_tidy_dimensions(self):
-        book = xlrd.open_workbook(from_this_dir('merged_cells.xlsx'))
-        for sheet in book.sheets():
-            for rowx in xrange(sheet.nrows):
-                self.assertEqual(sheet.row_len(rowx), sheet.ncols)

tests/test_workbook.py

@@ -7,7 +7,7 @@
 from xlrd.book import Book
 from xlrd.sheet import Sheet
 
-from .base import from_this_dir
+from .helpers import from_sample
 
 SHEETINDEX = 0
 NROWS = 15
@@ -19,7 +19,7 @@ class TestWorkbook(TestCase):
                   'AXISDATUMLEVELS', 'PROFILELEVELS']
 
     def setUp(self):
-        self.book = open_workbook(from_this_dir('profiles.xls'))
+        self.book = open_workbook(from_sample('profiles.xls'))
 
     def test_open_workbook(self):
         self.assertTrue(isinstance(self.book, Book))