fix #4, remove excessive trailing columns and empty rows underneath

Author: chfw

.travis.yml

@@ -12,8 +12,6 @@ python:
 install:
   - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install weakrefset; fi
   - if [[ $TRAVIS_PYTHON_VERSION == "2.6" ]]; then pip install ordereddict; fi
-  - pip install https://github.com/chfw/pyexcel/archive/master.zip
-  - pip install https://github.com/chfw/pyexcel-io/archive/master.zip
   - pip install -r requirements.txt
   - pip install -r tests/requirements.txt
 script:

docs/source/conf.py

@@ -52,7 +52,7 @@
 
 # General information about the project.
 project = u'pyexcel-ods3'
-copyright = u'2015, C.W.'
+copyright = u'Onni Software Ltd. and its contributors'
 author = u'C.W.'
 
 # The version info for the project you're documenting, acts as replacement for

pyexcel_ods3/__init__.py

@@ -103,12 +103,16 @@ def to_array(self):
         as an array (rows) of arrays (columns)"""
         table = []
         for row in range(self.native_sheet.nrows()):
-            rows = []
+            row_data = []
+            tmp_row = []
             for column, cell in enumerate(self.native_sheet.row(row)):
-                ret = self._read_cell(cell)
-                rows.append(ret)
-            # if row contained something
-            table.append(rows)
+                cell_value = self._read_cell(cell)
+                tmp_row.append(cell_value)
+                if cell_value is not None and cell_value != '':
+                    row_data += tmp_row
+                    tmp_row = []
+            if len(row_data) > 0:
+                table.append(row_data)
 
         return table
 

tests/base.py

@@ -3,14 +3,12 @@
 
 
 def create_sample_file1(file):
-    w = pyexcel.Writer(file)
     data=['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 1.1, 1]
     table = []
     table.append(data[:4])
     table.append(data[4:8])
     table.append(data[8:12])
-    w.write_array(table)
-    w.close()
+    pyexcel.save_as(array=table, dest_file_name=file)
 
 
 class PyexcelHatWriterBase:
@@ -24,10 +22,8 @@ class PyexcelHatWriterBase:
     }
 
     def test_series_table(self):
-        w = pyexcel.Writer(self.testfile)
-        w.write_dict(self.content)
-        w.close()
-        r = pyexcel.SeriesReader(self.testfile)
+        pyexcel.save_as(adict=self.content, dest_file_name=self.testfile)
+        r = pyexcel.get_sheet(file_name=self.testfile, name_columns_by_row=0)
         actual = pyexcel.utils.to_dict(r)
         assert actual == self.content
 
@@ -47,40 +43,19 @@ class PyexcelWriterBase:
     ]
 
     def _create_a_file(self, file):
-        w = pyexcel.Writer(file)
-        w.write_array(self.content)
-        w.close()
+        pyexcel.save_as(dest_file_name=file,array=self.content)
 
     def test_write_array(self):
         self._create_a_file(self.testfile)
-        r = pyexcel.Reader(self.testfile)
+        r = pyexcel.get_sheet(file_name=self.testfile)
         actual = pyexcel.utils.to_array(r.rows())
         assert actual == self.content
 
-    def test_write_reader(self):
-        """
-        Use reader as data container
-
-        this test case shows the file written by pyexcel
-        can be read back by itself
-        """
-        self._create_a_file(self.testfile)
-        r = pyexcel.Reader(self.testfile)
-        w2 = pyexcel.Writer(self.testfile2)
-        w2.write_reader(r)
-        w2.close()
-        r2 = pyexcel.Reader(self.testfile2)
-        r2.format(int)
-        actual = pyexcel.utils.to_array(r2.rows())
-        assert actual == self.content
-
 
 class PyexcelMultipleSheetBase:
 
     def _write_test_file(self, filename):
-        w = pyexcel.BookWriter(filename)
-        w.write_book_from_dict(self.content)
-        w.close()
+        pyexcel.save_book_as(bookdict=self.content, dest_file_name=filename)
 
     def _clean_up(self):
         if os.path.exists(self.testfile2):
@@ -122,20 +97,6 @@ def test_iterate_through_sheets(self):
             data = pyexcel.utils.to_array(s)
             assert self.content[s.name] == data
 
-    def test_write_a_book_reader(self):
-        b = pyexcel.BookReader(self.testfile)
-        bw = pyexcel.BookWriter(self.testfile2)
-        for s in b:
-            data = pyexcel.utils.to_array(s)
-            sheet = bw.create_sheet(s.name)
-            sheet.write_array(data)
-            sheet.close()
-        bw.close()
-        x = pyexcel.BookReader(self.testfile2)
-        for s in x:
-            data = pyexcel.utils.to_array(s)
-            assert self.content[s.name] == data
-
     def test_random_access_operator(self):
         r = pyexcel.BookReader(self.testfile)
         value = r["Sheet1"][0,1]

tests/test_mutliple_sheets.py

@@ -53,9 +53,7 @@ def _write_test_file(self, file):
         3,3,3,3
         """
         self.rows = 3
-        w = pyexcel.BookWriter(file)
-        w.write_book_from_dict(self.content)
-        w.close()
+        pyexcel.save_book_as(bookdict=self.content, dest_file_name=file)
 
     def setUp(self):
         self.testfile = "multiple1.ods"
@@ -118,8 +116,8 @@ def test_add_book1(self):
         """
         test this scenario: book3 = book1 + book2
         """
-        b1 = pyexcel.BookReader(self.testfile)
-        b2 = pyexcel.BookReader(self.testfile2)
+        b1 = pyexcel.get_book(file_name=self.testfile)
+        b2 = pyexcel.get_book(file_name=self.testfile2)
         b3 = b1 + b2
         content = pyexcel.utils.to_dict(b3)
         sheet_names = content.keys()

tests/test_stringio.py

@@ -29,10 +29,7 @@ def test_xls_output_stringio(self):
             [1, 2, 3],
             [4, 5, 6]
         ]
-        io = StringIO()
-        w = pyexcel.Writer(("ods",io))
-        w.write_rows(data)
-        w.close()
+        io = pyexcel.save_as(dest_file_type='ods', array=data)
         r = pyexcel.Reader(("ods", io.getvalue()))
         result=[1, 2, 3, 4, 5, 6]
         actual = pyexcel.utils.to_array(r.enumerate())