tabular-reader 0.1.0__tar.gz → 0.1.1__tar.gz

{tabular_reader-0.1.0 → tabular_reader-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tabular-reader
-Version: 0.1.0
+Version: 0.1.1
 Summary: Read XLSX, XLS and CSV files with a uniform interface Read XLSX, XLS and CSV files with a uniform interface
 License: MIT
 License-File: LICENSE
@@ -22,6 +22,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: openpyxl (>=3.0,<3.1)
+Requires-Dist: xlrd (>=2.0,<3.0)
 Project-URL: Repository, https://github.com/arkhan/tabular-reader
 Description-Content-Type: text/plain
 

{tabular_reader-0.1.0 → tabular_reader-0.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tabular-reader"
-version = "0.1.0"
+version = "0.1.1"
 description = "Read XLSX, XLS and CSV files with a uniform interface Read XLSX, XLS and CSV files with a uniform interface"
 authors = ["arkhan <arkhan@riseup.net>"]
 license = "MIT"
@@ -26,6 +26,7 @@ classifiers = [
 [tool.poetry.dependencies]
 python = "^3.6"
 openpyxl = ">=3.0,<3.1"
+xlrd = ">=2.0,<3.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^6.2"

{tabular_reader-0.1.0 → tabular_reader-0.1.1}/tabular_reader/__init__.py

@@ -2,5 +2,5 @@
 
 from .reader import TabularReader
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 __all__ = ["TabularReader"]

{tabular_reader-0.1.0 → tabular_reader-0.1.1}/tabular_reader/reader.py

@@ -3,8 +3,6 @@ import csv
 import os
 from types import SimpleNamespace
 
-from openpyxl import load_workbook
-
 
 def get_file_format(filename):
     _, ext = os.path.splitext(filename)
@@ -28,7 +26,25 @@ def read_csv(filename, **kwargs):
     ]
 
 
+def read_xls(filename, worksheet="", **kwargs):
+    import xlrd
+
+    wb = xlrd.open_workbook(filename)
+    ws = wb.sheet_by_name(worksheet) if worksheet else wb.sheet_by_index(0)
+
+    total = [[cell.value for cell in row] for row in ws.get_rows()]
+    header = total[0] if total else []
+    filtered_indices = [
+        i for i, val in enumerate(header) if val is not None and str(val).strip() != ""
+    ]
+    return [
+        [row[i] if i < len(row) else None for i in filtered_indices] for row in total
+    ]
+
+
 def read_xlsx(filename, worksheet="", **kwargs):
+    from openpyxl import load_workbook
+
     excel_kwargs = {
         k: v for k, v in kwargs.items() if k not in ["delimiter", "encoding"]
     }
@@ -61,8 +77,10 @@ class TabularReader:
 
         if file_format == "csv":
             filtered_data = read_csv(filename, **kwargs)
-        elif file_format in ("xlsx", "xls"):
+        elif file_format == "xlsx":
             filtered_data = read_xlsx(filename, worksheet, **kwargs)
+        elif file_format == "xls":
+            filtered_data = read_xls(filename, worksheet, **kwargs)
         else:
             raise ValueError(f"Unsupported format: {file_format}")