Skip to content

Commit

Permalink
deletes a line which should have been deleted when switching to using…
Browse files Browse the repository at this point in the history
… pandas and changes docstring
  • Loading branch information
Evan Rosen committed Dec 6, 2012
1 parent 91eeb0f commit 1d66461
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions gcat/__init__.py
Expand Up @@ -57,9 +57,9 @@ def get_file(title, fmt='dict', **kwargs):
If keyword argument sheet_name or sheet_id is given, returns only specified sheet.
The `fmt` keyword argument determines the format of the return value.
Here is the list of accepted formats and the corresponding return value type:
* `dict` : list of dicts (Default).
* `xlrd` : xlrd.Book (only full workbook is exported)
* `list` : list of lists
* `dict` : list of dicts (Default).
* `xlrd` : xlrd.Book (only full workbook is exported)
* `list` : list of lists
* `pandas_excel` : Pandas.ExcelFile, usefule for custom parsing
For all formats other than `xlrd`, if no sheet name is given, get_file returns
a dict with sheet names as keys and accordingly formatted rows as values.
Expand All @@ -81,7 +81,6 @@ def get_file(title, fmt='dict', **kwargs):
except:
logger.exception('error parsing worksheet using pandas.ExcelFile.parse(sheet_name). '
'Consider using pandas_excel and parsing the file yourself to have more control')
parsed_wb = parse(wb, opts)
if fmt == 'list':
fmt_wb = {name : list(df.itertuples()) for name, df in parsed_wb.items()}
elif fmt == 'dict':
Expand Down

0 comments on commit 1d66461

Please sign in to comment.