Merge pull request #315 from cls1991/develop

DataBook().load function params error.

HISTORY.rst

@@ -1,6 +1,27 @@
 History
 -------
 
+0.11.3 (2016-02-16)
++++++++++++++++++++
+
+- Release fix.
+
+0.11.2 (2016-02-16)
++++++++++++++++++++
+
+**Bugfixes**
+
+- Fix export only formats.
+- Fix for xlsx output.
+
+0.11.1 (2016-02-07)
++++++++++++++++++++
+
+**Bugfixes**
+
+- Fixed packaging error on Python 3.
+
+
 0.11.0 (2016-02-07)
 +++++++++++++++++++
 

Makefile

@@ -3,4 +3,4 @@ test:
 publish:
 	python setup.py register
 	python setup.py sdist upload
-	python setup.py bdist_wheel upload --universal
+	python setup.py bdist_wheel --universal upload

README.rst

@@ -142,6 +142,8 @@ To install tablib, simply: ::
 
 	$ pip install tablib
 
+Make sure to check out `Tablib on PyPi <https://pypi.python.org/pypi/tablib/>`_!
+
 
 Contribute
 ----------

docs/conf.py

@@ -41,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Tablib'
-copyright = u'2011. A <a href="http://kennethreitz.com/pages/open-projects.html">Kenneth Reitz</a> Project'
+copyright = u'2016. A <a href="http://kennethreitz.org/">Kenneth Reitz</a> Project'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

docs/development.rst

@@ -155,7 +155,7 @@ Once installed, we can generate our xUnit report with a single command. ::
 
 This will generate a **nosetests.xml** file, which can then be analyzed.
 
-.. _Nose: http://somethingaboutorange.com/mrl/projects/nose/
+.. _Nose: https://github.com/nose-devs/nose
 
 
 

setup.py

@@ -40,32 +40,26 @@ packages = [
     'tablib', 'tablib.formats',
     'tablib.packages',
     'tablib.packages.omnijson',
-    'tablib.packages.unicodecsv'
+    'tablib.packages.unicodecsv',
+    'tablib.packages.xlwt',
+    'tablib.packages.xlrd',
+    'tablib.packages.odf',
+    'tablib.packages.openpyxl',
+    'tablib.packages.openpyxl.shared',
+    'tablib.packages.openpyxl.reader',
+    'tablib.packages.openpyxl.writer',
+    'tablib.packages.yaml',
+    'tablib.packages.dbfpy',
+    'tablib.packages.xlwt3',
+    'tablib.packages.xlrd3',
+    'tablib.packages.odf3',
+    'tablib.packages.openpyxl3',
+    'tablib.packages.openpyxl3.shared',
+    'tablib.packages.openpyxl3.reader',
+    'tablib.packages.openpyxl3.writer',
+    'tablib.packages.yaml3',
+    'tablib.packages.dbfpy3'
 ]
-if sys.version_info[0] == 2:
-    packages.extend([
-        'tablib.packages.xlwt',
-        'tablib.packages.xlrd',
-        'tablib.packages.odf',
-        'tablib.packages.openpyxl',
-        'tablib.packages.openpyxl.shared',
-        'tablib.packages.openpyxl.reader',
-        'tablib.packages.openpyxl.writer',
-        'tablib.packages.yaml',
-        'tablib.packages.dbfpy'
-    ])
-else:
-    packages.extend([
-        'tablib.packages.xlwt3',
-        'tablib.packages.xlrd3',
-        'tablib.packages.odf3',
-        'tablib.packages.openpyxl3',
-        'tablib.packages.openpyxl3.shared',
-        'tablib.packages.openpyxl3.reader',
-        'tablib.packages.openpyxl3.writer',
-        'tablib.packages.yaml3',
-        'tablib.packages.dbfpy3'
-    ])
 
 
 setup(

tablib/core.py

@@ -18,8 +18,8 @@ from tablib.compat import OrderedDict, unicode
 
 
 __title__ = 'tablib'
-__version__ = '0.11.0'
-__build__ = 0x001100
+__version__ = '0.11.3'
+__build__ = 0x001103
 __author__ = 'Kenneth Reitz'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2016 Kenneth Reitz'
@@ -252,12 +252,13 @@ class Dataset(object):
             try:
                 try:
                     setattr(cls, fmt.title, property(fmt.export_set, fmt.import_set))
+                    setattr(cls, 'get_%s' % fmt.title, fmt.export_set)
+                    setattr(cls, 'set_%s' % fmt.title, fmt.import_set)
                     cls._formats[fmt.title] = (fmt.export_set, fmt.import_set)
                 except AttributeError:
                     setattr(cls, fmt.title, property(fmt.export_set))
+                    setattr(cls, 'get_%s' % fmt.title, fmt.export_set)
                     cls._formats[fmt.title] = (fmt.export_set, None)
-                setattr(cls, 'get_%s' % fmt.title, fmt.export_set)
-                setattr(cls, 'set_%s' % fmt.title, fmt.import_set)
 
             except AttributeError:
                 cls._formats[fmt.title] = (None, None)
@@ -1104,7 +1105,7 @@ class Databook(object):
         """The number of the :class:`Dataset` objects within :class:`Databook`."""
         return len(self._datasets)
 
-    def load(self, format, in_stream, **kwargs):
+    def load(self, in_stream, format, **kwargs):
         """
         Import `in_stream` to the :class:`Databook` object using the `format`.
 

tablib/formats/_xlsx.py

@@ -17,6 +17,7 @@ import tablib
 Workbook = openpyxl.workbook.Workbook
 ExcelWriter = openpyxl.writer.excel.ExcelWriter
 get_column_letter = openpyxl.cell.get_column_letter
+DataTypeException = openpyxl.shared.exc.DataTypeException
 
 from tablib.compat import unicode
 
@@ -120,32 +121,30 @@ def dset_sheet(dataset, ws, freeze_panes=True):
             if (row_number == 1) and dataset.headers:
                 # ws.cell('%s%s'%(col_idx, row_number)).value = unicode(
                     # '%s' % col, errors='ignore')
-                ws.cell('%s%s'%(col_idx, row_number)).value = unicode(col)
                 style = ws.get_style('%s%s' % (col_idx, row_number))
                 style.font.bold = True
                 if freeze_panes:
-                    # We want to freeze the column after the last column
-                    ws.freeze_panes = '%s%s' % (frzn_col_idx, row_number)
+                    # As already done in #53, but after Merge lost:
+                    #  Export Freeze only after first Line
+                    ws.freeze_panes = 'A2'
 
             # bold separators
             elif len(row) < dataset.width:
-                ws.cell('%s%s'%(col_idx, row_number)).value = unicode(
-                    '%s' % col, errors='ignore')
                 style = ws.get_style('%s%s' % (col_idx, row_number))
                 style.font.bold = True
 
             # wrap the rest
             else:
                 try:
-                    if '\n' in col:
-                        ws.cell('%s%s'%(col_idx, row_number)).value = unicode(
-                            '%s' % col, errors='ignore')
+                    str_col_value = unicode(col)
+                except TypeError:
+                    str_col_value = ''
+
+                    if '\n' in str_col_value:
                         style = ws.get_style('%s%s' % (col_idx, row_number))
                         style.alignment.wrap_text
-                    else:
-                        ws.cell('%s%s'%(col_idx, row_number)).value = unicode(
-                            '%s' % col, errors='ignore')
-                except TypeError:
-                    ws.cell('%s%s'%(col_idx, row_number)).value = unicode(col)
-
 
+            try:
+                ws.cell('%s%s' % (col_idx, row_number)).value = col
+            except (ValueError, TypeError, DataTypeException):
+                ws.cell('%s%s' % (col_idx, row_number)).value = unicode(col)