🔨 code refactoring

Author: chfw

pyexcel_xlsxr/__init__.py

@@ -8,7 +8,6 @@
 from pyexcel_io.io import get_data as read_data
 from pyexcel_io.io import isstream
 from pyexcel_io.plugins import IOPluginInfoChainV2
-
 from pyexcel_xlsxr._version import __author__, __version__  # noqa
 
 __FILE_TYPE__ = "xlsx"

pyexcel_xlsxr/_version.py

@@ -1,2 +1,2 @@
-__version__ = '0.6.0'
-__author__ = 'chfw'
+__version__ = "0.6.0"
+__author__ = "chfw"

pyexcel_xlsxr/xlsxr.py

@@ -2,9 +2,7 @@
 from io import BytesIO
 
 import pyexcel_io.service as service
-from pyexcel_io.plugin_api.abstract_reader import IReader
-from pyexcel_io.plugin_api.abstract_sheet import ISheet
-
+from pyexcel_io.plugin_api import IReader, ISheet, NamedContent
 from pyexcel_xlsxr.messy_xlsx import XLSXBookSet
 
 
@@ -15,20 +13,14 @@ def __init__(
         auto_detect_int=True,
         auto_detect_float=True,
         auto_detect_datetime=True,
-        **keywords
     ):
-        self._native_sheet = sheet
+        self.xlsx_sheet = sheet
         self.__auto_detect_int = auto_detect_int
         self.__auto_detect_float = auto_detect_float
         self.__auto_detect_datetime = auto_detect_datetime
-        self._keywords = keywords
-
-    @property
-    def name(self):
-        return self._native_sheet.name
 
     def row_iterator(self):
-        return self._native_sheet.raw()
+        return self.xlsx_sheet.raw()
 
     def column_iterator(self, row):
         for cell in row:
@@ -57,30 +49,24 @@ def __convert_cell(self, cell):
 
 class XLSXBook(IReader):
     def __init__(self, file_alike_object, _, **keywords):
-        self._native_book = XLSXBookSet(file_alike_object)
+        self.xlsx_book = XLSXBookSet(file_alike_object)
         self._keywords = keywords
-        tables = self._native_book.make_tables()
+        tables = self.xlsx_book.make_tables()
         self.content_array = [
-            NameObject(table.name, table) for table in tables
+            NameContent(table.name, table) for table in tables
         ]
 
     def read_sheet(self, sheet_index):
         """read a sheet at a specified index"""
-        table = self.content_array[sheet_index].sheet
+        table = self.content_array[sheet_index].payload
         sheet = XLSXSheet(table, **self._keywords)
         return sheet
 
     def close(self):
-        self._native_book.close()
+        self.xlsx_book.close()
 
 
 class XLSXBookInContent(XLSXBook):
     def __init__(self, file_content, file_type, **keywords):
         file_stream = BytesIO(file_content)
         super().__init__(file_stream, file_type, **keywords)
-
-
-class NameObject(object):
-    def __init__(self, name, sheet):
-        self.name = name
-        self.sheet = sheet

tests/test_bug_fixes.py

@@ -2,6 +2,7 @@
 from unittest.mock import MagicMock
 
 from nose.tools import eq_
+
 from pyexcel_io.reader import EncapsulatedSheetReader
 from pyexcel_xlsxr import get_data
 

tests/test_filter.py

@@ -1,6 +1,7 @@
 import os
 
 from nose.tools import eq_
+
 from pyexcel_io import get_data, save_data
 
 

tests/test_reading.py

@@ -2,8 +2,8 @@
 from datetime import datetime, time
 
 from nose.tools import eq_
-from pyexcel_io._compact import OrderedDict
 
+from pyexcel_io._compact import OrderedDict
 from pyexcel_xlsxr import get_data
 
 

tests/test_stringio.py

@@ -1,9 +1,10 @@
 import os
 
 import pyexcel
-from base import create_sample_file1
 from nose.tools import eq_
 
+from base import create_sample_file1
+
 
 class TestStringIO:
     def test_xlsx_stringio(self):