Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'feature/xls-import' of https://github.com/xdissent/tablib
… into develop
  • Loading branch information
Kenneth Reitz committed Jul 14, 2011
2 parents 33a8331 + f6d7888 commit fde6f11
Show file tree
Hide file tree
Showing 17 changed files with 10,363 additions and 3 deletions.
79 changes: 78 additions & 1 deletion NOTICE
Expand Up @@ -172,4 +172,81 @@ Libknecht St., 4
+7(0712)56-09-83

<roman@kiseliov.ru>
Subject: pyExcelerator
Subject: pyExcelerator




XLRD License
============

Portions copyright © 2005-2009, Stephen John Machin, Lingfo Pty Ltd
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

3. None of the names of Stephen John Machin, Lingfo Pty Ltd and any
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.


Copyright (c) 2001 David Giffin.
All rights reserved.

Based on the the Java version: Andrew Khan Copyright (c) 2000.


Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.

3. All advertising materials mentioning features or use of this
software must display the following acknowledgment:
"This product includes software developed by
David Giffin <david@giffin.org>."

4. Redistributions of any form whatsoever must retain the following
acknowledgment:
"This product includes software developed by
David Giffin <david@giffin.org>."

THIS SOFTWARE IS PROVIDED BY DAVID GIFFIN ``AS IS'' AND ANY
EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID GIFFIN OR
ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.
1 change: 1 addition & 0 deletions tablib/compat.py
Expand Up @@ -39,6 +39,7 @@
from cStringIO import StringIO as BytesIO
from cStringIO import StringIO
import tablib.packages.xlwt as xlwt
import tablib.packages.xlrd as xlrd
from tablib.packages import markup
from itertools import ifilter
from tablib.packages import openpyxl
Expand Down
44 changes: 42 additions & 2 deletions tablib/formats/_xls.py
Expand Up @@ -5,8 +5,8 @@

import sys

from tablib.compat import BytesIO, xlwt

from tablib.compat import BytesIO, xlwt, xlrd
import tablib

title = 'xls'
extentions = ('xls',)
Expand All @@ -16,6 +16,38 @@
bold = xlwt.easyxf("font: bold on")


def import_set(dset, in_stream, headers=True):
"""Returns dataset from XLS stream."""

dset.wipe()

wb = xlrd.open_workbook(file_contents=in_stream)
ws = wb.sheet_by_index(0)

for i in range(ws.nrows):
if (i == 0) and (headers):
dset.headers = ws.row_values(i)
else:
dset.append(ws.row_values(i))


def import_book(dbook, in_stream, headers=True):
"""Returns databook from XLS stream."""

dbook.wipe()

wb = xlrd.open_workbook(file_contents=in_stream)
for ws in wb.sheets():
data = tablib.Dataset()
data.title = ws.name
for i in range(ws.nrows):
if (i == 0) and (headers):
data.headers = ws.row_values(i)
else:
data.append(ws.row_values(i))
dbook.add_sheet(data)


def export_set(dataset):
"""Returns XLS representation of Dataset."""

Expand Down Expand Up @@ -80,3 +112,11 @@ def dset_sheet(dataset, ws):
ws.write(i, j, col)


def detect(stream):
"""Returns True if given stream is valid XLS."""

try:
xlrd.open_workbook(file_contents=stream)
return True
except xlrd.XLRDError:
return False

0 comments on commit fde6f11

Please sign in to comment.