Added decorator to XlrdTests

Author: WillAyd

pandas/tests/io/test_excel.py

@@ -146,17 +146,11 @@ class ReadingTestsBase(SharedItems):
     #
     # Base class for test cases to run with different Excel readers.
     # To add a reader test, define the following:
-    # 1. A check_skip function that skips your tests if your reader isn't
-    #    installed.
-    # 2. Add a property ext, which is the file extension that your reader
+    # 1. Add a property ext, which is the file extension that your reader
     #    reades from. (needs to start with '.' so it's a valid path)
-    # 3. Add a property engine_name, which is the name of the reader class.
+    # 2. Add a property engine_name, which is the name of the reader class.
     #    For the reader this is not used for anything at the moment.
 
-    def setup_method(self, method):
-        self.check_skip()
-        super(ReadingTestsBase, self).setup_method(method)
-
     def test_usecols_int(self):
 
         dfref = self.get_csv_refdf('test1')
@@ -567,6 +561,7 @@ def test_sheet_name_both_raises(self):
             self.get_exceldf('test1', sheetname='Sheet1', sheet_name='Sheet1')
 
 
+@td.skip_if_no('xlrd', '0.9')
 class XlrdTests(ReadingTestsBase):
     """
     This is the base class for the xlrd tests, and 3 different file formats
@@ -589,7 +584,6 @@ def test_excel_read_buffer(self):
     def test_read_xlrd_Book(self):
         _skip_if_no_xlwt()
 
-        import xlrd
         df = self.frame
         with ensure_clean('.xls') as pth:
             df.to_excel(pth, "SheetA")
@@ -713,9 +707,9 @@ def tdf(sheetname):
                 tm.assert_frame_equal(dfs[s], dfs_returned[s])
 
     def test_reader_seconds(self):
-        # Test reading times with and without milliseconds. GH5945.
         import xlrd
 
+        # Test reading times with and without milliseconds. GH5945.
         if LooseVersion(xlrd.__VERSION__) >= LooseVersion("0.9.3"):
             # Xlrd >= 0.9.3 can handle Excel milliseconds.
             expected = DataFrame.from_dict({"Time": [time(1, 2, 3),
@@ -1061,19 +1055,16 @@ def test_read_excel_squeeze(self):
 class TestXlsReaderTests(XlrdTests):
     ext = '.xls'
     engine_name = 'xlrd'
-    check_skip = staticmethod(_skip_if_no_xlrd)
 
 
 class TestXlsxReaderTests(XlrdTests):
     ext = '.xlsx'
     engine_name = 'xlrd'
-    check_skip = staticmethod(_skip_if_no_xlrd)
 
 
 class TestXlsmReaderTests(XlrdTests):
     ext = '.xlsm'
     engine_name = 'xlrd'
-    check_skip = staticmethod(_skip_if_no_xlrd)
 
 
 class ExcelWriterBase(SharedItems):

pandas/util/_test_decorators.py

@@ -57,7 +57,11 @@ def safe_import(mod_name, min_version=None):
         return mod
     else:
         import sys
-        version = getattr(sys.modules[mod_name], '__version__')
+        try:
+            version = getattr(sys.modules[mod_name], '__version__')
+        except AttributeError:
+            # xlrd uses a capitalized attribute name
+            version = getattr(sys.modules[mod_name], '__VERSION__')
         if version:
             from distutils.version import LooseVersion
             if LooseVersion(version) >= LooseVersion(min_version):