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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tabular-reader
-Version: 0.1.0
+Version: 0.1.2
 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,10 +22,13 @@ 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
+#+TITLE: tabular-reader
+
+* tabular_reader
 
 ** Description
 A module that maps information from each row in XLSX, XLS, or CSV

{tabular_reader-0.1.0 → tabular_reader-0.1.2}/README.org

@@ -1,4 +1,6 @@
-* tabular_reader
+#+TITLE: tabular-reader
+
+* tabular_reader
 
 ** Description
 A module that maps information from each row in XLSX, XLS, or CSV

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tabular-reader"
-version = "0.1.0"
+version = "0.1.2"
 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.2}/tabular_reader/__init__.py

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

tabular_reader-0.1.2/tabular_reader/reader.py

@@ -0,0 +1,166 @@
+#!/usr/bin/env python
+import csv
+import io
+import os
+from types import SimpleNamespace
+
+
+def get_file_format(filename):
+    if isinstance(filename, (io.BytesIO, bytes)):
+        return None
+    _, ext = os.path.splitext(filename)
+    return ext.lower().lstrip(".")
+
+
+def read_csv(source, **kwargs):
+    csv_kwargs = {
+        k: v for k, v in kwargs.items() if k in ["delimiter", "quotechar", "encoding"]
+    }
+
+    if isinstance(source, io.BytesIO):
+        source.seek(0)
+        f = io.TextIOWrapper(source, encoding=csv_kwargs.pop("encoding", "utf-8-sig"))
+    else:
+        f = open(source, "r", encoding=csv_kwargs.pop("encoding", "utf-8-sig"))
+
+    try:
+        reader = csv.reader(f, **csv_kwargs)
+        total = list(reader)
+    finally:
+        if not isinstance(source, io.BytesIO):
+            f.close()
+
+    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_xls(source, worksheet="", **kwargs):
+    import xlrd
+
+    if isinstance(source, io.BytesIO):
+        source.seek(0)
+        wb = xlrd.open_workbook(file_contents=source.read())
+    else:
+        wb = xlrd.open_workbook(source)
+
+    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(source, worksheet="", **kwargs):
+    from openpyxl import load_workbook
+
+    excel_kwargs = {
+        k: v for k, v in kwargs.items() if k not in ["delimiter", "encoding"]
+    }
+
+    if isinstance(source, io.BytesIO):
+        source.seek(0)
+
+    wb = load_workbook(source, **excel_kwargs)
+    ws = worksheet and wb[worksheet] or wb.active
+
+    total = [[col.value for col in row] for row in ws]
+    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
+    ]
+
+
+class TabularReader:
+    def __init__(
+        self,
+        source,
+        worksheet="",
+        fieldnames=None,
+        restval=None,
+        restkey=None,
+        skip_blank_lines=False,
+        *args,
+        **kwargs,
+    ):
+        file_format = get_file_format(source)
+
+        if file_format is None:
+            filtered_data = self._detect_and_read_bytes(source, worksheet, **kwargs)
+        elif file_format == "csv":
+            filtered_data = read_csv(source, **kwargs)
+        elif file_format == "xlsx":
+            filtered_data = read_xlsx(source, worksheet, **kwargs)
+        elif file_format == "xls":
+            filtered_data = read_xls(source, worksheet, **kwargs)
+        else:
+            raise ValueError(f"Unsupported format: {file_format}")
+
+        self.reader = iter(filtered_data)
+        self._fieldnames = fieldnames
+        self.restkey = restkey
+        self.restval = restval
+        self.skip_blank_lines = skip_blank_lines
+        self.line_num = 0
+
+    def _detect_and_read_bytes(self, source, worksheet, **kwargs):
+        errors = []
+
+        for fmt, reader_func in [
+            ("xlsx", read_xlsx),
+            ("xls", read_xls),
+            ("csv", read_csv),
+        ]:
+            try:
+                if isinstance(source, io.BytesIO):
+                    source.seek(0)
+                return reader_func(source, worksheet, **kwargs)
+            except Exception as e:
+                errors.append((fmt, str(e)))
+                if isinstance(source, io.BytesIO):
+                    source.seek(0)
+
+        raise ValueError(
+            f"Could not detect file format. Tried: {', '.join(f[0] for f in errors)}"
+        )
+
+    @property
+    def fieldnames(self):
+        if self._fieldnames is None:
+            try:
+                self._fieldnames = next(self.reader)
+            except StopIteration:
+                pass
+        self.line_num += 1
+        return self._fieldnames
+
+    @fieldnames.setter
+    def fieldnames(self, value):
+        self._fieldnames = value
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        if self.line_num == 0:
+            self.fieldnames
+        row = next(self.reader)
+        self.line_num += 1
+        while self.skip_blank_lines and all(cell is None for cell in row):
+            row = next(self.reader)
+        record = SimpleNamespace(**dict(zip(self.fieldnames, row)))
+        return record
+
+    next = __next__

tabular_reader-0.1.0/tabular_reader/reader.py

@@ -1,103 +0,0 @@
-#!/usr/bin/env python
-import csv
-import os
-from types import SimpleNamespace
-
-from openpyxl import load_workbook
-
-
-def get_file_format(filename):
-    _, ext = os.path.splitext(filename)
-    return ext.lower().lstrip(".")
-
-
-def read_csv(filename, **kwargs):
-    csv_kwargs = {
-        k: v for k, v in kwargs.items() if k in ["delimiter", "quotechar", "encoding"]
-    }
-    with open(filename, "r", encoding=csv_kwargs.pop("encoding", "utf-8-sig")) as f:
-        reader = csv.reader(f, **csv_kwargs)
-        total = list(reader)
-
-    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):
-    excel_kwargs = {
-        k: v for k, v in kwargs.items() if k not in ["delimiter", "encoding"]
-    }
-    wb = load_workbook(filename, **excel_kwargs)
-    ws = worksheet and wb[worksheet] or wb.active
-
-    total = [[col.value for col in row] for row in ws]
-    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
-    ]
-
-
-class TabularReader:
-    def __init__(
-        self,
-        filename,
-        worksheet="",
-        fieldnames=None,
-        restval=None,
-        restkey=None,
-        skip_blank_lines=False,
-        *args,
-        **kwargs,
-    ):
-        file_format = get_file_format(filename)
-
-        if file_format == "csv":
-            filtered_data = read_csv(filename, **kwargs)
-        elif file_format in ("xlsx", "xls"):
-            filtered_data = read_xlsx(filename, worksheet, **kwargs)
-        else:
-            raise ValueError(f"Unsupported format: {file_format}")
-
-        self.reader = iter(filtered_data)
-        self._fieldnames = fieldnames
-        self.restkey = restkey
-        self.restval = restval
-        self.skip_blank_lines = skip_blank_lines
-        self.line_num = 0
-
-    @property
-    def fieldnames(self):
-        if self._fieldnames is None:
-            try:
-                self._fieldnames = next(self.reader)
-            except StopIteration:
-                pass
-        self.line_num += 1
-        return self._fieldnames
-
-    @fieldnames.setter
-    def fieldnames(self, value):
-        self._fieldnames = value
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        if self.line_num == 0:
-            self.fieldnames
-        row = next(self.reader)
-        self.line_num += 1
-        while self.skip_blank_lines and all(cell is None for cell in row):
-            row = next(self.reader)
-        record = SimpleNamespace(**dict(zip(self.fieldnames, row)))
-        return record
-
-    next = __next__