adejones · June 23, 2021 15:24 · Aug 2, 2019 · Mar 2, 2018 · Mar 2, 2018 · Mar 2, 2018
diff --git a/xlsx_dict_reader.py b/xlsx_dict_reader.py
@@ -1,7 +1,7 @@
-import openpyxl
+from openpyxl import load_workbook
 
 def XLSXDictReader(f):
-    book = openpyxl.reader.excel.load_workbook(f)
+    book = load_workbook(f)
     sheet = book.active
     rows = sheet.max_row
     cols = sheet.max_column

diff --git a/xlsx-dict-reader.py → xlsx_dict_reader.py b/xlsx-dict-reader.py → xlsx_dict_reader.py
diff --git a/xlsx-dict-reader.py b/xlsx-dict-reader.py
@@ -1,3 +1,5 @@
+import openpyxl
+
 def XLSXDictReader(f):
     book = openpyxl.reader.excel.load_workbook(f)
     sheet = book.active

diff --git a/xlsx-dict-reader.py b/xlsx-dict-reader.py
@@ -1,6 +1,6 @@
 def XLSXDictReader(f):
     book = openpyxl.reader.excel.load_workbook(f)
-    sheet = book.get_active_sheet()
+    sheet = book.active
     rows = sheet.max_row
     cols = sheet.max_column
     headers = dict((i, sheet.cell(row=1, column=i).value) for i in range(1, cols))

diff --git a/xlsx-dict-reader.py b/xlsx-dict-reader.py
@@ -0,0 +1,9 @@
+def XLSXDictReader(f):
+    book = openpyxl.reader.excel.load_workbook(f)
+    sheet = book.get_active_sheet()
+    rows = sheet.max_row
+    cols = sheet.max_column
+    headers = dict((i, sheet.cell(row=1, column=i).value) for i in range(1, cols))
+    def item(i, j):
+        return (sheet.cell(row=1, column=j).value, sheet.cell(row=i, column=j).value)
+    return (dict(item(i, j) for j in range(1, cols + 1)) for i in range(2, rows + 1))