Merge branch 'master' of http://github.com/chfw/pyexcel-ods3

Author: chfw

.travis.yml

@@ -9,6 +9,7 @@ python:
   - 3.4
 install:
   - pip install git+https://github.com/chfw/ezodf.git
+  - pip install git+https://github.com/chfw/pyexcel.git
   - pip install -r requirements.txt --use-mirrors
   - pip install -r tests/requirements.txt --use-mirrors
 script:

README.rst

@@ -205,3 +205,10 @@ Test coverage
 ==============
 
 `code coverage <https://codecov.io/github/chfw/pyexcel-ods3>`_
+
+.. testcode::
+   :hide:
+
+   >>> import os
+   >>> os.unlink("your_file.ods")
+   >>> os.unlink("another_file.ods")

tests/base.py

@@ -70,6 +70,7 @@ def test_write_reader(self):
         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
 
@@ -106,7 +107,7 @@ def test_reading_through_sheets(self):
         expected = [[u'X', u'Y', u'Z'], [1, 4, 7], [2, 5, 8], [3, 6, 9]]
         assert data == expected
         sheet3 = b["Sheet3"]
-        sheet3.become_series()
+        sheet3.name_columns_by_row(0)
         data = pyexcel.utils.to_array(b["Sheet3"].rows())
         expected = [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
         assert data == expected
@@ -137,14 +138,12 @@ def test_write_a_book_reader(self):
 
     def test_random_access_operator(self):
         r = pyexcel.BookReader(self.testfile)
-        value = r["Sheet1"][0][1]
+        value = r["Sheet1"][0,1]
         assert value == 1
-        value = r["Sheet3"][0][1]
-        assert value == 'Y'
-        value = r["Sheet3"].become_series()[0][1]
-        assert value == 4
-        value = r["Sheet3"].become_sheet()[0][1]
+        value = r["Sheet3"][0,1]
         assert value == 'Y'
+        r["Sheet3"].name_columns_by_row(0)
+        assert r["Sheet3"][0,1] == 4
 
 
 class ODSCellTypes:

tests/requirements.txt

@@ -1,4 +1,4 @@
-pyexcel
+pyexcel-xl
 nose
 rednose
 nose-cov

tests/test_mutliple_sheets.py

@@ -2,6 +2,7 @@
 import pyexcel
 import os
 from pyexcel.ext import ods3
+from pyexcel.ext import xl
 from base import create_sample_file1
 
 
@@ -62,7 +63,7 @@ def setUp(self):
         self._write_test_file(self.testfile2)
 
     def test_delete_sheets(self):
-        b1 = pyexcel.readers.Book(self.testfile)
+        b1 = pyexcel.load_book(self.testfile)
         assert len(b1.sheet_names()) == 3
         del b1["Sheet1"]
         assert len(b1.sheet_names()) == 2
@@ -81,7 +82,7 @@ def test_delete_sheets(self):
 
     def test_delete_sheets2(self):
         """repetitively delete first sheet"""
-        b1 = pyexcel.readers.Book(self.testfile)
+        b1 = pyexcel.load_book(self.testfile)
         del b1[0]
         assert len(b1.sheet_names()) == 2
         del b1[0]