From 33609515779e4de4135af77bca9a97d504242767 Mon Sep 17 00:00:00 2001
From: Alex Rothberg <agrothberg@gmail.com>
Date: Wed, 31 Jul 2013 09:04:07 -0400
Subject: [PATCH 1/2] ENH Pass kwds from ExcelFile ctr to xlrd.open_workbook.
 For example, this allows setting  formatting_info=True (GH4438)

---
 pandas/io/excel.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandas/io/excel.py b/pandas/io/excel.py
index 534a88e303dbf..031081f557794 100644
--- a/pandas/io/excel.py
+++ b/pandas/io/excel.py
@@ -78,10 +78,10 @@ def __init__(self, path_or_buf, kind=None, **kwds):
         self.tmpfile = None
 
         if isinstance(path_or_buf, compat.string_types):
-            self.book = xlrd.open_workbook(path_or_buf)
+            self.book = xlrd.open_workbook(path_or_buf, **kwds)
         else:
             data = path_or_buf.read()
-            self.book = xlrd.open_workbook(file_contents=data)
+            self.book = xlrd.open_workbook(file_contents=data, **kwds)
 
     def parse(self, sheetname, header=0, skiprows=None, skip_footer=0,
               index_col=None, parse_cols=None, parse_dates=False,

From 820bc5dc35114453d8e92959c30b9c18b3b4b851 Mon Sep 17 00:00:00 2001
From: Alex Rothberg <agrothberg@gmail.com>
Date: Fri, 16 Aug 2013 19:30:17 -0400
Subject: [PATCH 2/2] ENH Unit test for setting formatting_info=True when
 creating ExcelFile so that merged cells may be read (GH4438)

---
 pandas/io/tests/data/merged.xls | Bin 0 -> 16384 bytes
 pandas/io/tests/test_excel.py   |  18 ++++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100755 pandas/io/tests/data/merged.xls

diff --git a/pandas/io/tests/data/merged.xls b/pandas/io/tests/data/merged.xls
new file mode 100755
index 0000000000000000000000000000000000000000..14b20be0788b335efea2a5d4753e8c26c34ed918
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/pandas/io/tests/test_excel.py b/pandas/io/tests/test_excel.py
index 1ac4d4e31ed10..07ea633987210 100644
--- a/pandas/io/tests/test_excel.py
+++ b/pandas/io/tests/test_excel.py
@@ -260,6 +260,24 @@ def test_excel_table(self):
         tm.assert_frame_equal(df4, df.ix[:-1])
         tm.assert_frame_equal(df4, df5)
 
+    def test_excel_read_merged_cells(self):
+        _skip_if_no_xlrd()
+
+        pth = os.path.join(self.dirpath, 'merged.xls')
+        xls = ExcelFile(pth, formatting_info=True)        
+        book = xls.book
+        sheet = book.sheet_by_index(0)
+        merged_cells = sheet.merged_cells
+        
+        self.assertEquals(len(merged_cells), 1)
+        rlo, rhi, clo, chi = merged_cells[0]
+        
+        self.assertEquals(rlo, 1)
+        self.assertEquals(rhi, 1+1)
+        
+        self.assertEquals(clo, 0)
+        self.assertEquals(chi, 1+1)
+
     def test_excel_read_buffer(self):
         _skip_if_no_xlrd()
         _skip_if_no_openpyxl()