merge with master branch to get the fix across

Author: chfw

Diff for: CHANGELOG.rst

@@ -1,6 +1,34 @@
 Change log
 ================================================================================
 
+0.4.0 - unreleased
+--------------------------------------------------------------------------------
+
+Updated
+********************************************************************************
+
+#. Updated to use lml interface
+
+
+0.3.2 - 07.05.2017
+--------------------------------------------------------------------------------
+
+Updated
+********************************************************************************
+
+#. issue `#2 <https://github.com/pyexcel/pyexcel-odsr/issues/2>`_, not all texts
+   in a multi-node cell were extracted.
+
+0.3.1 - 13.04.2017
+--------------------------------------------------------------------------------
+
+Updated
+********************************************************************************
+
+#. issue `#1 <https://github.com/pyexcel/pyexcel-odsr/issues/1>`_, PT288H00M00S
+   is valid duration
+
+
 0.3.0 - 02.02.2017
 --------------------------------------------------------------------------------
 

Diff for: README.rst

@@ -2,11 +2,14 @@
 pyexcel-odsr - Let you focus on data, instead of ods format
 ================================================================================
 
-.. image:: https://api.travis-ci.org/pyexcel/pyexcel-odsr.png
-    :target: http://travis-ci.org/pyexcel/pyexcel-odsr
+.. image:: https://raw.githubusercontent.com/pyexcel/pyexcel.github.io/master/images/patreon.png
+   :target: https://www.patreon.com/pyexcel
+
+.. image:: https://api.travis-ci.org/pyexcel/pyexcel-odsr.svg?branch=master
+   :target: http://travis-ci.org/pyexcel/pyexcel-odsr
 
 .. image:: https://codecov.io/github/pyexcel/pyexcel-odsr/coverage.png
-    :target: https://codecov.io/github/pyexcel/pyexcel-odsr
+   :target: https://codecov.io/github/pyexcel/pyexcel-odsr
 
 **pyexcel-odsr** is a specialized ods reader based on tailored ods reader from
 `messytables <https://github.com/okfn/messytables>`_.
@@ -35,7 +38,7 @@ or clone it and install it:
 
 .. code-block:: bash
 
-    $ git clone http://github.com/pyexcel/pyexcel-odsr.git
+    $ git clone https://github.com/pyexcel/pyexcel-odsr.git
     $ cd pyexcel-odsr
     $ python setup.py install
 
@@ -310,3 +313,10 @@ This library is based on the ods of messytables, Open Knowledge Foundation Ltd.
    >>> import os
    >>> os.unlink("your_file.ods")
    >>> os.unlink("another_file.ods")
+
+Support the project
+================================================================================
+
+If your company has embedded pyexcel and its components into a revenue generating
+product, please `support me on patreon <https://www.patreon.com/pyexcel>`_ to
+maintain the project and develop it further.

Diff for: docs/source/conf.py

@@ -21,7 +21,7 @@
 
 project = u'pyexcel-odsr'
 copyright = u'2015-2017 Onni Software Ltd.'
-version = '0.3.1'
+version = '0.3.2'
 release = '0.4.0'
 exclude_patterns = []
 pygments_style = 'sphinx'

Diff for: pyexcel_odsr.yml

@@ -2,7 +2,7 @@ overrides: "pyexcel.yaml"
 name: "pyexcel-odsr"
 nick_name: odsr
 version: 0.4.0
-release: 0.3.1
+release: 0.3.2
 file_type: ods
 dependencies:
   - pyexcel-io>=0.4.0

Diff for: pyexcel_odsr/messyods.py

@@ -193,10 +193,8 @@ def _read_text_cell(element):
     children = element.getchildren()
     text_content = []
     for child in children:
-        if child.text:
-            text_content.append(child.text)
-        else:
-            text_content.append('')
+        text = "".join([x for x in child.itertext()])
+        text_content.append(text)
     if len(text_content) > 0:
         cell_value = '\n'.join(text_content)
     else:

Diff for: setup.cfg

@@ -0,0 +1,4 @@
+[metadata]
+description-file = README.rst
+[bdist_wheel]
+universal = 1

Diff for: setup.py

@@ -7,7 +7,11 @@
 
 NAME = 'pyexcel-odsr'
 AUTHOR = 'C.W.'
+<<<<<<< HEAD
 VERSION = '0.4.0'
+=======
+VERSION = '0.3.2'
+>>>>>>> master
 EMAIL = 'wangc_2011 (at) hotmail.com'
 LICENSE = 'New BSD'
 DESCRIPTION = (

Diff for: tests/fixtures/multinode-in-a-p.ods

@@ -74,3 +74,13 @@ def test_issue_1_error():
     from pyexcel_odsr.converter import time_value
     result = time_value('PT1111')
     eq_(result, None)
+<<<<<<< HEAD
+=======
+
+
+def test_issue_2():
+    test_file = "multinode-in-a-p.ods"
+    data = get_data(os.path.join("tests", "fixtures", test_file),
+                    skip_empty_rows=True, library='pyexcel-odsr')
+    eq_(data['product.template'][1][1], 'PRODUCT NAME PMP')
+>>>>>>> master