fix #10 support two dimensional generators: a generator list of a generator list

Author: chfw

CHANGELOG.rst

@@ -1,6 +1,15 @@
 Change log
 ================================================================================
 
+0.2.3 - unreleased
+--------------------------------------------------------------------------------
+
+Updated
+********************************************************************************
+
+#. `#10 <https://github.com/pyexcel/pyexcel-xls/issues/10>`_, To support
+   generator as member of the incoming two dimensional data
+
 0.2.2 - 31.08.2016
 --------------------------------------------------------------------------------
 

README.rst

@@ -280,7 +280,7 @@ Development steps for code changes
 
 Upgrade your setup tools and pip. They are needed for development and testing only:
 
-#. pip install --upgrade setuptools "pip==7.1" 
+#. pip install --upgrade setuptools "pip==7.1"
 
 Then install relevant development requirements:
 

docs/source/conf.py

@@ -16,8 +16,8 @@
 
 project = u'pyexcel-xls'
 copyright = u'2015-2016 Onni Software Ltd.'
-version = '0.2.1'
-release = '0.2.2'
+version = '0.2.2'
+release = '0.2.3'
 exclude_patterns = []
 pygments_style = 'sphinx'
 html_theme = 'default'

pyexcel_xls.yaml

@@ -1,8 +1,8 @@
 overrides: "pyexcel.yaml"
 name: "pyexcel-xls"
 nick_name: xls
-version: 0.2.2
-release: 0.2.1
+version: 0.2.3
+release: 0.2.2
 file_type: xls
 dependencies:
   - pyexcel-io>=0.2.2

pyexcel_xls/xls.py

@@ -190,8 +190,7 @@ def write_row(self, array):
         """
         write a row into the file
         """
-        for i in range(len(array)):
-            value = array[i]
+        for i, value in enumerate(array):
             style = None
             tmp_array = []
             if isinstance(value, datetime.datetime):

setup.py

@@ -10,10 +10,9 @@
 
 NAME = 'pyexcel-xls'
 AUTHOR = 'C.W.'
-VERSION = '0.2.2'
+VERSION = '0.2.3'
 EMAIL = 'wangc_2011 (at) hotmail.com'
 LICENSE = 'New BSD'
-PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])
 DESCRIPTION = (
     'A wrapper library to read, manipulate and write data in xls format. It' +
     ' reads xlsx and xlsm format' +
@@ -28,19 +27,6 @@
     'xlsm'
 ]
 
-INSTALL_REQUIRES = [
-    'pyexcel-io>=0.2.2',
-    'xlrd',
-]
-
-if PY2:
-    INSTALL_REQUIRES.append('xlwt')
-if not PY2:
-    INSTALL_REQUIRES.append('xlwt-future')
-
-EXTRAS_REQUIRE = {
-}
-
 CLASSIFIERS = [
     'Topic :: Office/Business',
     'Topic :: Utilities',
@@ -57,19 +43,56 @@
     'Programming Language :: Python :: Implementation :: PyPy'
 ]
 
+INSTALL_REQUIRES = [
+    'pyexcel-io>=0.2.2',
+    'xlrd',
+]
+
+if PY2:
+    INSTALL_REQUIRES.append('xlwt')
+if not PY2:
+    INSTALL_REQUIRES.append('xlwt-future')
+
+PACKAGES = find_packages(exclude=['ez_setup', 'examples', 'tests'])
+EXTRAS_REQUIRE = {
+}
+
 
 def read_files(*files):
     """Read files into setup"""
     text = ""
     for single_file in files:
-        text = text + read(single_file) + "\n"
+        content = read(single_file)
+        text = text + content + "\n"
     return text
 
 
 def read(afile):
     """Read a file into setup"""
     with open(afile, 'r') as opened_file:
-        return opened_file.read()
+        content = filter_out_test_code(opened_file)
+        content = "".join(list(content))
+        return content
+
+
+def filter_out_test_code(file_handle):
+    found_test_code = False
+    for line in file_handle.readlines():
+        if line.startswith('.. testcode:'):
+            found_test_code = True
+            continue
+        if found_test_code is True:
+            if line.startswith('  '):
+                continue
+            else:
+                empty_line = line.strip()
+                if len(empty_line) == 0:
+                    continue
+                else:
+                    found_test_code = False
+                    yield line
+        else:
+            yield line
 
 
 if __name__ == '__main__':
@@ -79,14 +102,14 @@ def read(afile):
         version=VERSION,
         author_email=EMAIL,
         description=DESCRIPTION,
-        install_requires=INSTALL_REQUIRES,
+        long_description=read_files('README.rst', 'CHANGELOG.rst'),
+        license=LICENSE,
         keywords=KEYWORDS,
         extras_require=EXTRAS_REQUIRE,
+        tests_require=['nose'],
+        install_requires=INSTALL_REQUIRES,
         packages=PACKAGES,
         include_package_data=True,
-        long_description=read_files('README.rst', 'CHANGELOG.rst'),
         zip_safe=False,
-        tests_require=['nose'],
-        license=LICENSE,
         classifiers=CLASSIFIERS
     )

test.bat

@@ -1,3 +1,4 @@
 
+
 pip freeze
-nosetests --with-cov --cover-package pyexcel_xls --cover-package tests --with-doctest --doctest-extension=.rst tests README.rst pyexcel_xls  && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long
+nosetests --with-cov --cover-package pyexcel_xls --cover-package tests --with-doctest --doctest-extension=.rst tests README.rst pyexcel_xls && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long

test.sh

@@ -1,3 +1,4 @@
 
+
 pip freeze
-nosetests --with-cov --cover-package pyexcel_xls --cover-package tests --with-doctest --doctest-extension=.rst tests README.rst pyexcel_xls  && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long
+nosetests --with-cov --cover-package pyexcel_xls --cover-package tests --with-doctest --doctest-extension=.rst tests README.rst pyexcel_xls && flake8 . --exclude=.moban.d --builtins=unicode,xrange,long

tests/test_bug_fixes.py

@@ -45,3 +45,12 @@ def test_issue_9_hidden_sheet_2(self):
         assert "hidden" in book_dict
         eq_(book_dict['shown'], [['A', 'B']])
         eq_(book_dict['hidden'], [['a', 'b']])
+
+    def test_issue_10_generator_as_content(self):
+        def data_gen():
+            def custom_row_renderer(row):
+                for e in row:
+                    yield e
+            for i in range(2):
+                yield custom_row_renderer([1,2])
+        save_data("test.xls", {"sheet": data_gen()})