numbers-parser 4.13.3__py3-none-any.whl → 4.14.2__py3-none-any.whl

numbers_parser/__init__.py

@@ -1,4 +1,4 @@
-__doc__ = """Parse and extract data from Apple Numbers spreadsheets"""
+"""Parse and extract data from Apple Numbers spreadsheets."""
 
 import importlib.metadata
 import os
@@ -20,11 +20,11 @@ _DEFAULT_NUMBERS_INSTALL_PATH = "/Applications/Numbers.app"
 _VERSION_PLIST_PATH = "Contents/version.plist"
 
 
-def _get_version():
+def _get_version() -> str:
     return __version__
 
 
-def _check_installed_numbers_version():
+def _check_installed_numbers_version() -> str:
     try:
         fp = open(os.path.join(_DEFAULT_NUMBERS_INSTALL_PATH, _VERSION_PLIST_PATH), "rb")
     except OSError:
@@ -37,7 +37,8 @@ def _check_installed_numbers_version():
     installed_version = re.sub(r"(\d+)\.(\d+)\.\d+", r"\1.\2", installed_version)
     if installed_version not in SUPPORTED_NUMBERS_VERSIONS:
         warnings.warn(
-            f"Numbers version {installed_version} not tested with this version", stacklevel=2,
+            f"Numbers version {installed_version} not tested with this version",
+            stacklevel=2,
         )
     fp.close()
     return installed_version

numbers_parser/_cat_numbers.py

@@ -3,7 +3,7 @@ import csv
 import logging
 import sys
 
-import sigfig
+from sigfig import round as sigfig
 
 from numbers_parser import Document, ErrorCell, FileError, FileFormatError, NumberCell, _get_version
 from numbers_parser import __name__ as numbers_parser_name
@@ -49,25 +49,34 @@ def command_line_parser():
         help="Dump formatted cells (durations) as they appear in Numbers",
     )
     parser.add_argument(
-        "-s", "--sheet", action="append", help="Names of sheet(s) to include in export",
+        "-s",
+        "--sheet",
+        action="append",
+        help="Names of sheet(s) to include in export",
     )
     parser.add_argument(
-        "-t", "--table", action="append", help="Names of table(s) to include in export",
+        "-t",
+        "--table",
+        action="append",
+        help="Names of table(s) to include in export",
     )
     parser.add_argument("document", nargs="*", help="Document(s) to export")
     parser.add_argument("--debug", default=False, action="store_true", help="Enable debug logging")
     parser.add_argument(
-        "--experimental", default=False, action="store_true", help=argparse.SUPPRESS,
+        "--experimental",
+        default=False,
+        action="store_true",
+        help=argparse.SUPPRESS,
     )
     return parser
 
 
-def print_sheet_names(filename):
+def print_sheet_names(filename) -> None:
     for sheet in Document(filename).sheets:
         print(f"{filename}: {sheet.name}")
 
 
-def print_table_names(filename):
+def print_table_names(filename) -> None:
     for sheet in Document(filename).sheets:
         for table in sheet.tables:
             print(f"{filename}: {sheet.name}: {table.name}")
@@ -76,19 +85,18 @@ def print_table_names(filename):
 def cell_as_string(args, cell):
     if isinstance(cell, ErrorCell) and not (args.formulas):
         return "#REF!"
-    elif args.formulas and cell.formula is not None:
+    if args.formulas and cell.formula is not None:
         return cell.formula
-    elif args.formatting and cell.formatted_value is not None:
+    if args.formatting and cell.formatted_value is not None:
         return cell.formatted_value
-    elif isinstance(cell, NumberCell):
-        return sigfig.round(cell.value, sigfigs=MAX_SIGNIFICANT_DIGITS, warn=False)
-    elif cell.value is None:
+    if isinstance(cell, NumberCell):
+        return sigfig(cell.value, sigfigs=MAX_SIGNIFICANT_DIGITS, warn=False)
+    if cell.value is None:
         return ""
-    else:
-        return str(cell.value)
+    return str(cell.value)
 
 
-def print_table(args, filename):
+def print_table(args, filename) -> None:
     writer = csv.writer(sys.stdout, dialect="excel")
     for sheet in Document(filename).sheets:
         if args.sheet is not None and sheet.name not in args.sheet:
@@ -103,7 +111,7 @@ def print_table(args, filename):
                 writer.writerow(cells)
 
 
-def main():
+def main() -> None:
     parser = command_line_parser()
     args = parser.parse_args()
 
@@ -129,7 +137,7 @@ def main():
                     print_table_names(filename)
                 else:
                     print_table(args, filename)
-            except FileFormatError as e:
+            except FileFormatError as e:  # noqa: PERF203
                 print(f"{filename}:", str(e), file=sys.stderr)
                 sys.exit(1)
             except FileError as e:

numbers_parser/_csv2numbers.py

@@ -3,13 +3,14 @@
 from __future__ import annotations
 
 import argparse
+import contextlib
 import csv
 import re
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from pathlib import Path
 from sys import exit, stderr
-from typing import NamedTuple, Tuple  # noqa: F401
+from typing import NamedTuple
 
 from dateutil.parser import parse
 
@@ -68,18 +69,18 @@ class Converter:
         """Parse a date string and return a datetime."""
         return parse(x, dayfirst=self.day_first).replace(tzinfo=timezone.utc)
 
-    def _transform_data(self):
+    def _transform_data(self) -> None:
         """Apply type transformations to the data based in current configuration."""
         # Convert data rows to dicts. csv.DictReader is not enough as we support CSV
         # files with no header.
         if self.no_header:
-            self.header = [x for x in range(len(self.data[0]))]
-        self.data = [{k: v for k, v in dict(zip(self.header, row)).items()} for row in self.data]
+            self.header = list(range(len(self.data[0])))
+        self.data = [dict(dict(zip(self.header, row)).items()) for row in self.data]
 
         if self.reverse:
             self.data = list(reversed(self.data))
         if self.date_columns is not None:
-            is_date_column = {x: True if x in self.date_columns else False for x in self.header}
+            is_date_column = {x: x in self.date_columns for x in self.header}
         for row in self.data:
             for k, v in row.items():
                 if self.whitespace:
@@ -88,17 +89,15 @@ class Converter:
                     row[k] = self._parse_date(v)
                 else:
                     # Attempt to coerce value into float
-                    try:
+                    with contextlib.suppress(ValueError):
                         row[k] = float(v.replace(",", ""))
-                    except ValueError:
-                        pass
 
     def rename_columns(self: Converter, mapper: dict) -> None:
         """Rename columns using column map."""
         if mapper is None:
             return
         self.no_header = False
-        self.header = [mapper[x] if x in mapper else x for x in self.header]
+        self.header = [mapper.get(x, x) for x in self.header]
 
     def delete_columns(self: Converter, columns: list) -> None:
         """Delete columns from the data."""
@@ -131,10 +130,7 @@ class Converter:
         doc = Document(num_rows=2, num_cols=2)
         table = doc.sheets[0].tables[0]
 
-        if self.no_header:
-            data = []
-        else:
-            data = [self.header]
+        data = [] if self.no_header else [self.header]
         data += [row.values() for row in self.data]
 
         for row_num, row in enumerate(data):
@@ -142,7 +138,10 @@ class Converter:
                 table.write(row_num, col_num, value)
                 if isinstance(value, datetime):
                     table.set_cell_formatting(
-                        row_num, col_num, "datetime", date_time_format="d MMM yyyy"
+                        row_num,
+                        col_num,
+                        "datetime",
+                        date_time_format="d MMM yyyy",
                     )
 
         doc.save(self.output_filename)

numbers_parser/_unpack_numbers.py

@@ -11,7 +11,6 @@ from binascii import hexlify
 from dataclasses import dataclass
 from pathlib import Path
 
-import regex
 from compact_json import Formatter
 
 from numbers_parser import __name__ as numbers_parser_name
@@ -35,7 +34,7 @@ class NumbersUnpacker(IWorkHandler):
 
     def store_file(self, filename: str, blob: bytes) -> None:
         """Store a profobuf archive."""
-        filename = regex.sub(r".*\.numbers/", "", str(filename))
+        filename = re.sub(r".*\.numbers/", "", str(filename))
         self.ensure_directory_exists(filename)
         target_path = os.path.join(self.output_dir, filename)
         if isinstance(blob, IWAFile):
@@ -65,13 +64,13 @@ class NumbersUnpacker(IWorkHandler):
             with open(target_path, "wb") as out:
                 out.write(blob)
 
-    def ensure_directory_exists(self, path: str):
+    def ensure_directory_exists(self, path: str) -> None:
         """Ensure that a path's directory exists."""
         parts = os.path.split(path)
         with contextlib.suppress(OSError):
             os.makedirs(os.path.join(*([self.output_dir, *list(parts[:-1])])))
 
-    def prettify_uuids(self, obj: object):
+    def prettify_uuids(self, obj: object) -> None:
         if isinstance(obj, dict):
             for k, v in obj.items():
                 if isinstance(v, dict):
@@ -91,7 +90,7 @@ class NumbersUnpacker(IWorkHandler):
                 elif isinstance(v, list):
                     self.prettify_uuids(v)
 
-    def prettify_cell_storage(self, obj: object):
+    def prettify_cell_storage(self, obj: object) -> None:
         if isinstance(obj, dict):
             for k, v in obj.items():
                 if isinstance(v, (dict, list)):
@@ -102,7 +101,7 @@ class NumbersUnpacker(IWorkHandler):
                 elif k in ["cell_offsets", k == "cell_offsets_pre_bnc"]:
                     offsets = array("h", b64decode(obj[k])).tolist()
                     obj[k] = ",".join([str(x) for x in offsets])
-                    obj[k] = regex.sub(r"(?:,-1)+$", ",[...]", obj[k])
+                    obj[k] = re.sub(r"(?:,-1)+$", ",[...]", obj[k])
         else:  # list
             for v in obj:
                 if isinstance(v, (dict, list)):
@@ -118,7 +117,7 @@ class NumbersUnpacker(IWorkHandler):
         return version in SUPPORTED_NUMBERS_VERSIONS
 
 
-def main():
+def main() -> None:
     parser = ArgumentParser()
     parser.add_argument("document", help="Apple Numbers file(s)", nargs="*")
     parser.add_argument("-V", "--version", action="store_true")

numbers_parser/bullets.py

@@ -1,6 +1,5 @@
-from roman import toRoman
-
 from numbers_parser.generated.TSWPArchives_pb2 import ListStyleArchive
+from numbers_parser.roman import to_roman
 
 BULLET_PREFIXES = {
     ListStyleArchive.kNumericDecimal: "",
@@ -24,12 +23,12 @@ BULLET_CONVERSION = {
     ListStyleArchive.kNumericDecimal: lambda x: str(x + 1),
     ListStyleArchive.kNumericDoubleParen: lambda x: str(x + 1),
     ListStyleArchive.kNumericRightParen: lambda x: str(x + 1),
-    ListStyleArchive.kRomanUpperDecimal: lambda x: toRoman(x + 1),
-    ListStyleArchive.kRomanUpperDoubleParen: lambda x: toRoman(x + 1),
-    ListStyleArchive.kRomanUpperRightParen: lambda x: toRoman(x + 1),
-    ListStyleArchive.kRomanLowerDecimal: lambda x: toRoman(x + 1).lower(),
-    ListStyleArchive.kRomanLowerDoubleParen: lambda x: toRoman(x + 1).lower(),
-    ListStyleArchive.kRomanLowerRightParen: lambda x: toRoman(x + 1).lower(),
+    ListStyleArchive.kRomanUpperDecimal: lambda x: to_roman(x + 1),
+    ListStyleArchive.kRomanUpperDoubleParen: lambda x: to_roman(x + 1),
+    ListStyleArchive.kRomanUpperRightParen: lambda x: to_roman(x + 1),
+    ListStyleArchive.kRomanLowerDecimal: lambda x: to_roman(x + 1).lower(),
+    ListStyleArchive.kRomanLowerDoubleParen: lambda x: to_roman(x + 1).lower(),
+    ListStyleArchive.kRomanLowerRightParen: lambda x: to_roman(x + 1).lower(),
     ListStyleArchive.kAlphaUpperDecimal: lambda x: chr(x + 65),
     ListStyleArchive.kAlphaUpperDoubleParen: lambda x: chr(x + 65),
     ListStyleArchive.kAlphaUpperRightParen: lambda x: chr(x + 65),