diff options
| author | Kenneth Reitz <me@kennethreitz.com> | 2011-05-13 00:30:03 -0400 |
|---|---|---|
| committer | Kenneth Reitz <me@kennethreitz.com> | 2011-05-13 00:30:03 -0400 |
| commit | cbdaa09e8324767926e49e814170a325758c072b (patch) | |
| tree | 430ac529ea85502e68fdfaad50f771496f123d63 /tablib/formats | |
| parent | f30e760657bc73a16559b948c0de53916fc63aa9 (diff) | |
| download | tablib-cbdaa09e8324767926e49e814170a325758c072b.tar.gz | |
success!!
Diffstat (limited to 'tablib/formats')
| -rw-r--r-- | tablib/formats/_xlsx.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/tablib/formats/_xlsx.py b/tablib/formats/_xlsx.py index 1a0713b..9cd63b5 100644 --- a/tablib/formats/_xlsx.py +++ b/tablib/formats/_xlsx.py @@ -7,14 +7,18 @@ import sys if sys.version_info[0] > 2: - from io import BytesIO + from io import BytesIO else: from cStringIO import StringIO as BytesIO -from tablib.packages.openpyxl.workbook import Workbook -from tablib.packages.openpyxl.writer.excel import ExcelWriter +from tablib.compat import openpyxl + +Workbook = openpyxl.workbook.Workbook +ExcelWriter = openpyxl.writer.excel.ExcelWriter +get_column_letter = openpyxl.cell.get_column_letter + +from tablib.compat import unicode -from tablib.packages.openpyxl.cell import get_column_letter title = 'xlsx' extentions = ('xlsx',) @@ -65,8 +69,9 @@ def dset_sheet(dataset, ws): # bold headers 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( + # '%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 ws.freeze_panes = '%s%s' % (col_idx, row_number) @@ -91,7 +96,6 @@ def dset_sheet(dataset, ws): 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( - '%s' % col, errors='ignore') + ws.cell('%s%s'%(col_idx, row_number)).value = unicode(col) |