Merge pull request #315 from cls1991/develop

DataBook().load function params error.

HISTORY.rst

@@ -1,6 +1,11 @@
 History
 -------
 
+0.11.3 (2016-02-16)
++++++++++++++++++++
+
+- Release fix.
+
 0.11.2 (2016-02-16)
 +++++++++++++++++++
 

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
 
 
 

tablib/core.py

@@ -18,8 +18,8 @@ from tablib.compat import OrderedDict, unicode
 
 
 __title__ = 'tablib'
-__version__ = '0.11.2'
+__version__ = '0.11.3'
-__build__ = 0x001102
+__build__ = 0x001103
 __author__ = 'Kenneth Reitz'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2016 Kenneth Reitz'
@@ -1105,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,7 +121,6 @@ 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:
@@ -130,23 +130,21 @@ def dset_sheet(dataset, ws, freeze_panes=True):
 
             # 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:
+                    str_col_value = unicode(col)
-                        ws.cell('%s%s'%(col_idx, row_number)).value = unicode(
+                except TypeError:
-                            '%s' % col, errors='ignore')
+                    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)