numbers-parser 4.16.1__tar.gz → 4.16.3__tar.gz

{numbers_parser-4.16.1/src/numbers_parser.egg-info → numbers_parser-4.16.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numbers-parser
-Version: 4.16.1
+Version: 4.16.3
 Summary: Read and write Apple Numbers spreadsheets
 Author-email: Jon Connell <python@figsandfudge.com>
 License-Expression: MIT
@@ -13,8 +13,9 @@ Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.rst
 Requires-Dist: compact-json<2.0.0,>=1.1.3
-Requires-Dist: protobuf<6.0,>=4.0
-Requires-Dist: python-snappy<1.0,>=0.7
+Requires-Dist: protobuf>=6.0
+Requires-Dist: python-snappy>=0.7
+Requires-Dist: cramjam>=2.11.0
 Requires-Dist: sigfig<2.0.0,>=1.3.3
 Requires-Dist: setuptools>=70.0.0
 Requires-Dist: importlib-resources>=6.1
@@ -484,6 +485,10 @@ The following limitations are expected to always remain:
   (introduced in `numbers-parser` version 4.16) is supported only for documents
   created by Numbers 12.0 and later. No warnings are issued for earlier
   Numbers documents.
+- Only standard macOS fonts are not supported. If a document includes a non-standard
+  font, numbers-parser will issue a UnsupportedWarning and default styles to
+  Helvetica Neue. Reading font names from the system would add additional system-specific
+  dependencies to the package and so this is not planned to changed.
 
 ## License
 

{numbers_parser-4.16.1 → numbers_parser-4.16.3}/README.md

@@ -460,6 +460,10 @@ The following limitations are expected to always remain:
   (introduced in `numbers-parser` version 4.16) is supported only for documents
   created by Numbers 12.0 and later. No warnings are issued for earlier
   Numbers documents.
+- Only standard macOS fonts are not supported. If a document includes a non-standard
+  font, numbers-parser will issue a UnsupportedWarning and default styles to
+  Helvetica Neue. Reading font names from the system would add additional system-specific
+  dependencies to the package and so this is not planned to changed.
 
 ## License
 

{numbers_parser-4.16.1 → numbers_parser-4.16.3}/pyproject.toml

@@ -6,8 +6,9 @@ license = "MIT"
 requires-python = "<4.0,>=3.9"
 dependencies = [
     "compact-json<2.0.0,>=1.1.3",
-    "protobuf<6.0,>=4.0",
-    "python-snappy<1.0,>=0.7",
+    "protobuf>=6.0",
+    "python-snappy>=0.7",
+    "cramjam>=2.11.0",
     "sigfig<2.0.0,>=1.3.3",
     "setuptools>=70.0.0",
     "importlib-resources>=6.1",
@@ -22,7 +23,7 @@ classifiers = [
 description = "Read and write Apple Numbers spreadsheets"
 name = "numbers-parser"
 readme = "README.md"
-version = "4.16.1"
+version = "4.16.3"
 
 [project.urls]
 repository = "https://github.com/masaccio/numbers-parser"
@@ -36,7 +37,7 @@ csv2numbers = "numbers_parser._csv2numbers:main"
 [dependency-groups]
 dev = [
     "gprof2dot<2023.0.0,>=2022.7.29",
-    "line-profiler<5.0.0,>=4.0.3",
+    "line-profiler>=5.0.0",
     "mock>=5.1.0",
     "pytest>=7.2.0",
     "pytest-check>=1.0",
@@ -68,18 +69,14 @@ bootstrap = [
 requires = ["setuptools >= 61.0"]
 build-backend = "setuptools.build_meta"
 
-# [tool.setuptools]
-# exclude-package-data = { "*" = ["tests*"]}
-# include-package-data = false
-# packages.find.include = ['numbers-parser/src*']
-# packages.find.exclude = ['tests*']
-# package-dir = { "" = "src" }
-
 [tool.setuptools.packages.find]
-where = ["src"]  # list of folders that contain the packages (["."] by default)
-include = ["numbers_parser*"]  # package names should match these glob patterns (["*"] by default)
-exclude = ["*tests*"]  # exclude packages matching these glob patterns (empty by default)
-namespaces = false  # to disable scanning PEP 420 namespaces (true by default)
+where = ["src"]
+include = ["numbers_parser*"]
+exclude = ["*tests*"]
+namespaces = false  # disable scanning PEP 420 namespaces
+
+[tool.setuptools.package-data]
+"numbers_parser" = ["data/*"]
 
 [tool.coverage.run]
 branch = true

{numbers_parser-4.16.1 → numbers_parser-4.16.3}/src/numbers_parser/model.py

@@ -790,9 +790,11 @@ class _NumbersModel(Cacheable):
         # Map table IDs to the base_owner_uids of the formula owners that match
         # the table model's haunted owner
         self._table_id_to_base_id = {
-            table_id: formula_owner_to_base_owner_map[
-                uuid_to_hex(self.objects[table_id].haunted_owner.owner_uid)
-            ]
+            table_id: formula_owner_to_base_owner_map.get(
+                uuid_to_hex(self.objects[table_id].haunted_owner.owner_uid),
+                # Some older documents do not have this mapping
+                None,
+            )
             for table_id in self.table_ids()
         }
         self._table_base_id_to_formula_owner_id = {

{numbers_parser-4.16.1 → numbers_parser-4.16.3/src/numbers_parser.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: numbers-parser
-Version: 4.16.1
+Version: 4.16.3
 Summary: Read and write Apple Numbers spreadsheets
 Author-email: Jon Connell <python@figsandfudge.com>
 License-Expression: MIT
@@ -13,8 +13,9 @@ Requires-Python: <4.0,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.rst
 Requires-Dist: compact-json<2.0.0,>=1.1.3
-Requires-Dist: protobuf<6.0,>=4.0
-Requires-Dist: python-snappy<1.0,>=0.7
+Requires-Dist: protobuf>=6.0
+Requires-Dist: python-snappy>=0.7
+Requires-Dist: cramjam>=2.11.0
 Requires-Dist: sigfig<2.0.0,>=1.3.3
 Requires-Dist: setuptools>=70.0.0
 Requires-Dist: importlib-resources>=6.1
@@ -484,6 +485,10 @@ The following limitations are expected to always remain:
   (introduced in `numbers-parser` version 4.16) is supported only for documents
   created by Numbers 12.0 and later. No warnings are issued for earlier
   Numbers documents.
+- Only standard macOS fonts are not supported. If a document includes a non-standard
+  font, numbers-parser will issue a UnsupportedWarning and default styles to
+  Helvetica Neue. Reading font names from the system would add additional system-specific
+  dependencies to the package and so this is not planned to changed.
 
 ## License
 

{numbers_parser-4.16.1 → numbers_parser-4.16.3}/src/numbers_parser.egg-info/SOURCES.txt

@@ -1,24 +1,6 @@
 LICENSE.rst
 README.md
 pyproject.toml
-src/build/extract_functions.py
-src/build/extract_mapping.py
-src/build/generate_fontmap.py
-src/build/generate_mapping.py
-src/build/protodump.py
-src/build/rename_proto_files.py
-src/build/replace_paths.py
-src/debug/dump_formats.py
-src/debug/dump_formula_nodes.py
-src/debug/dump_formulas.py
-src/debug/dump_metadata.py
-src/debug/dump_strokes.py
-src/debug/dump_tree.py
-src/debug/dump_uids.py
-src/debug/lldbutil.py
-src/debug/profile_large_read.py
-src/debug/profile_large_write.py
-src/debug/sdiff-no-ids.py
 src/numbers_parser/__init__.py
 src/numbers_parser/_cat_numbers.py
 src/numbers_parser/_csv2numbers.py
@@ -46,6 +28,7 @@ src/numbers_parser.egg-info/dependency_links.txt
 src/numbers_parser.egg-info/entry_points.txt
 src/numbers_parser.egg-info/requires.txt
 src/numbers_parser.egg-info/top_level.txt
+src/numbers_parser/data/empty.numbers
 src/numbers_parser/generated/TNArchives_pb2.py
 src/numbers_parser/generated/TNArchives_sos_pb2.py
 src/numbers_parser/generated/TNCommandArchives_pb2.py

{numbers_parser-4.16.1 → numbers_parser-4.16.3}/src/numbers_parser.egg-info/requires.txt

@@ -1,6 +1,7 @@
 compact-json<2.0.0,>=1.1.3
-protobuf<6.0,>=4.0
-python-snappy<1.0,>=0.7
+protobuf>=6.0
+python-snappy>=0.7
+cramjam>=2.11.0
 sigfig<2.0.0,>=1.3.3
 setuptools>=70.0.0
 importlib-resources>=6.1

numbers_parser-4.16.1/src/build/extract_functions.py

@@ -1,104 +0,0 @@
-import re
-import sys
-from subprocess import PIPE, Popen
-
-# Code pattern in AArch64:
-#
-#         mov     w8, #325
-#         strh    w8, [sp, #8]
-#         str     x23, [sp]
-#         adrp    x2, 2590 ; 0x14e0000
-#         add     x2, x2, #3776 ; Objc cfstring ref: @"GETPIVOTDATA"
-#
-# TSCEFunction_GETPIVOTDATA::evaluateWithContext(...
-
-# Additional required code pattern in AArch64 for Numbers 14.2:
-#
-#         mov     w0, #319
-#         bl      TSCEFormulaCreationMagic::function_3arg(...
-#         ;
-#         ; Approx. 20 lines
-#         ;
-# TSCEFormulaCreationMagic::TEXTBETWEEN(...
-
-if len(sys.argv) != 3:
-    print(f"Usage: {sys.argv[0]} framework-file output.py", file=sys.stderr)
-    sys.exit(1)
-
-framework = sys.argv[1]
-output_map = sys.argv[2]
-
-if framework.endswith(".s"):
-    with open(framework, "rb") as fh:
-        disassembly = fh.readlines()
-else:
-    objdump = Popen(  # noqa: S603
-        [  # noqa: S607
-            "objdump",
-            "--disassemble",
-            "--no-addresses",
-            "--no-print-imm-hex",
-            "--no-show-raw-insn",
-            "--macho",
-            "--objc-meta-data",
-            framework,
-        ],
-        stdout=PIPE,
-    )
-    cxxfilt = Popen(["c++filt"], stdin=objdump.stdout, stdout=PIPE)  # noqa: S603, S607
-    objdump.stdout.close()
-    disassembly = str(cxxfilt.communicate()[0]).split("\\n")
-
-arg = None
-line_count = 0
-tsce_functions = {}
-function_refs = {}
-
-previous_line = ""
-for line in disassembly:
-    line = str(line).replace("\\t", " ")  # noqa: PLW2901
-    if m := re.search(r"mov *w8, #(\d+)", line):
-        arg = m.group(1)
-        line_count = 0
-        continue
-
-    if arg is not None:
-        line_count += 1
-        if line_count > 30:
-            arg = None
-            line_count = 0
-
-    if m := re.search(r'x2, x2.*Objc cfstring ref: @"([A-Z0-9\.]+)"', line):
-        if arg is not None and line_count <= 8:
-            func = m.group(1).replace("_", ".")
-            print(f"Found cstring {func} = {arg}")
-            function_refs[func] = arg
-            arg = None
-            line_count = 0
-    elif m := re.search(r"bl *TSCEFormulaCreationMagic::function_3arg\(", line):
-        if m := re.search(r"mov *w0, #(\d+)", previous_line):
-            arg = m.group(1)
-            line_count = 0
-    elif (m := re.search(r"TSCEFormulaCreationMagic::(\w+)\(", line)) and arg is not None:
-        func = m.group(1).replace("_", ".")
-        print(f"Found TSCEFormulaCreationMagic {func} = {arg}")
-        function_refs[func] = arg
-        arg = None
-        line_count = 0
-    elif m := re.search(r"TSCEFunction_(\w+)::evaluateWithContext", line):
-        func = m.group(1).replace("_", ".")
-        print(f"Found TSCEFunction {func}")
-        tsce_functions[func] = True
-
-    previous_line = line
-
-function_refs = dict(sorted(function_refs.items(), key=lambda x: int(x[1])))
-with open(output_map, "w") as fh:
-    fh.write("FUNCTION_MAP = {\n")
-    if "ABS" not in function_refs:
-        fh.write('    1: "ABS",\n')
-    for func_name, func_id in function_refs.items():
-        if func in tsce_functions:
-            fh.write(f'    {func_id}: "{func_name}",\n')
-
-    fh.write("}\n")

numbers_parser-4.16.1/src/build/extract_mapping.py

@@ -1,102 +0,0 @@
-"""
-lldb script to dump TSPersistence registry mapping from iWork apps.
-
-Licensed under the MIT license.
-
-Copyright 2020-2022 Peter Sobot
-Copyright 2022 Jon Connell
-Copyright 2022 SheetJS LLC
-"""
-
-import json
-import os
-import sys
-
-import lldb
-
-from debug.lldbutil import print_stacktrace
-
-if len(sys.argv) != 3:
-    msg = f"Usage: {sys.argv[0]} exe-file output.json"
-    raise (ValueError(msg))
-
-exe = sys.argv[1]
-output = sys.argv[2]
-
-debugger = lldb.SBDebugger.Create()
-debugger.SetAsync(False)
-target = debugger.CreateTargetWithFileAndArch(exe, None)
-
-# # Note: original script also created breakpoints on _handleAEOpenEvent
-# # but that is too early in Numbers 12.1
-# target.BreakpointCreateByName("-[NSApplication _sendFinishLaunchingNotification]")
-# target.BreakpointCreateByName("-[NSApplication _crashOnException:]")
-
-# # Note: original script skipped [CKContainer containerWithIdentifier:]
-# target.BreakpointCreateByRegex("CloudKit")
-
-target.BreakpointCreateByName("_sendFinishLaunchingNotification")
-target.BreakpointCreateByName("_handleAEOpenEvent:")
-# To get around the fact that we don't have iCloud entitlements when running re-signed code,
-# let's break in the CloudKit code and early exit the function before it can raise an exception:
-target.BreakpointCreateByName("[CKContainer containerWithIdentifier:]")
-# In later Keynote versions, 'containerWithIdentifier' isn't called directly, but we can break on similar methods:
-# Note: this __lldb_unnamed_symbol hack was determined by painstaking experimentation. It will break again for sure.
-target.BreakpointCreateByRegex("___lldb_unnamed_symbol[0-9]+", "CloudKit")
-
-
-process = target.LaunchSimple(None, None, os.getcwd())
-if not process:
-    raise ValueError("Failed to launch process: " + exe)
-
-if process.GetState() == lldb.eStateExited:
-    msg = f"LLDB was unable to stop process! {process}"
-    raise ValueError(msg)
-
-try:
-    while process.GetState() == lldb.eStateStopped:
-        thread = process.GetThreadAtIndex(0)
-        frame = thread.GetSelectedFrame()
-        if frame.name == "-[NSApplication _crashOnException:]":
-            msg = f"Process crashed at {frame.name}"
-            raise ValueError(msg)
-
-        stop_reason = thread.GetStopReason()
-
-        if stop_reason == lldb.eStopReasonException:
-            print_stacktrace(thread)
-            function = frame.GetFunction()
-            function_or_symbol = function if function else frame.GetSymbol()
-            msg = f"Exception at {frame.name}"
-            raise ValueError(msg)
-        if stop_reason != lldb.eStopReasonBreakpoint:
-            process.Continue()
-            continue
-        if frame.name[-8:] == "CloudKit":
-            thread.ReturnFromFrame(
-                thread.GetSelectedFrame(),
-                lldb.SBValue().CreateValueFromExpression("0", ""),
-            )
-            process.Continue()
-        elif frame.name == "-[NSApplication _sendFinishLaunchingNotification]":
-            registry = frame.EvaluateExpression("[TSPRegistry sharedRegistry]")
-            error = registry.GetError()
-            if error.fail or registry.description is None:
-                continue
-                # raise (ValueError("Failed to extract registry"))
-            split = [
-                x.strip().split(" -> ")
-                for x in registry.description.split("{")[1].split("}")[0].split("\n")
-                if x.strip()
-            ]
-            json_str = json.dumps(
-                dict(sorted([(int(a), b.split(" ")[-1]) for a, b in split if "null" not in b])),
-                indent=2,
-            )
-            with open(output, "w") as fh:
-                fh.write(json_str)
-            break
-        else:
-            process.Continue()
-finally:
-    process.Kill()

numbers_parser-4.16.1/src/build/generate_fontmap.py

@@ -1,22 +0,0 @@
-import sys
-
-import Cocoa
-
-if len(sys.argv) != 2:
-    msg = f"Usage: {sys.argv[0]} fontmap.py"
-    raise (ValueError(msg))
-
-mapping_py = sys.argv[1]
-
-with open(mapping_py, "w") as fh:
-    manager = Cocoa.NSFontManager.sharedFontManager()
-    font_families = list(manager.availableFontFamilies())
-
-    print("FONT_NAME_TO_FAMILY = {", file=fh)
-    for family in sorted(font_families):
-        fonts = manager.availableMembersOfFontFamily_(family)
-        for font in fonts:
-            print(f'    "{font[0]}": "{family}",', file=fh)
-    print('    "Calibri": "Calibri",', file=fh)
-    print('    "Cambria": "Cambria",', file=fh)
-    print("}", file=fh)

numbers_parser-4.16.1/src/build/generate_mapping.py

@@ -1,70 +0,0 @@
-import json
-import os
-import sys
-
-if len(sys.argv) != 3:
-    msg = f"Usage: {sys.argv[0]} mapping.json mapping.py"
-    raise (ValueError(msg))
-
-mapping_json = sys.argv[1]
-mapping_py = sys.argv[2]
-
-modules = []
-module_import_output = ""
-module_files_output = ""
-mapping_output = ""
-for filename in os.listdir("src/numbers_parser/generated"):
-    if "pb2" in filename:
-        module = filename.replace("_pb2.py", "")
-        modules.append(module)
-        module_import_output += f"from numbers_parser.generated import {module}_pb2 as {module}\n"
-        module_files_output += f"    {module},\n"
-
-with open(mapping_json) as fh:
-    mappings = json.load(fh)
-
-for index, symbol in sorted(mappings.items(), key=lambda x: int(x[0])):
-    mapping_output += f'    "{index}": "{symbol}",\n'
-
-OUTPUT_CODE = f"""{module_import_output.strip()}
-
-PROTO_FILES = [
-    {module_files_output.strip()}
-]
-
-TSPRegistryMapping = {{
-    {mapping_output.strip()}
-}}
-
-
-def compute_maps():
-    name_class_map = {{}}
-
-    def add_nested_types(message_type):
-        for name in dict(message_type.DESCRIPTOR.nested_types_by_name):
-            child_type = getattr(message_type, name)
-            name_class_map[child_type.DESCRIPTOR.full_name] = child_type
-            add_nested_types(child_type)
-
-    for file in PROTO_FILES:
-        for message_name in dict(file.DESCRIPTOR.message_types_by_name):
-            message_type = getattr(file, message_name)
-            name_class_map[message_type.DESCRIPTOR.full_name] = message_type
-            add_nested_types(message_type)
-
-    id_name_map = {{}}
-    name_id_map = {{}}
-    for k, v in list(TSPRegistryMapping.items()):
-        if v in name_class_map:  # pragma: no branch
-            id_name_map[int(k)] = name_class_map[v]
-            if v not in name_id_map:
-                name_id_map[v] = int(k)
-
-    return name_class_map, id_name_map, name_id_map
-
-
-NAME_CLASS_MAP, ID_NAME_MAP, NAME_ID_MAP = compute_maps()
-"""
-
-with open(mapping_py, "w") as fh:
-    fh.write(OUTPUT_CODE)