numbers-parser 4.22.0__tar.gz → 4.22.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {numbers_parser-4.22.0/src/numbers_parser.egg-info → numbers_parser-4.22.2}/PKG-INFO +4 -5
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/README.md +3 -4
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/pyproject.toml +3 -1
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/_unpack_numbers.py +10 -2
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/cell.py +18 -22
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/document.py +7 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/iwork.py +1 -1
- {numbers_parser-4.22.0 → numbers_parser-4.22.2/src/numbers_parser.egg-info}/PKG-INFO +4 -5
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_formatting.py +28 -1
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_issues.py +7 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_unpack_numbers.py +31 -2
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/LICENSE.rst +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/setup.cfg +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/__init__.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/_cat_numbers.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/_csv2numbers.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/bullets.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/constants.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/containers.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/currencies.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/data/empty.numbers +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/exceptions.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/experimental.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/formula.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TNArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TNArchives_sos_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TNCommandArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TNCommandArchives_sos_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSAArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSAArchives_sos_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSACommandArchives_sos_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCEArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCH3DArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCHArchives_Common_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCHArchives_GEN_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCHArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCHArchives_sos_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCHCommandArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCHPreUFFArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCKArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCKArchives_sos_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSDArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSDArchives_sos_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSDCommandArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSKArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSPArchiveMessages_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSPDatabaseMessages_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSPMessages_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSSArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSSArchives_sos_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSTArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSTArchives_sos_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSTCommandArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSTStylePropertyArchiving_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSWPArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSWPArchives_sos_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSWPCommandArchives_pb2.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/__init__.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/fontmap.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/functionmap.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/mapping.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/iwafile.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/model.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/numbers_cache.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/numbers_uuid.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/roman.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/xrefs.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser.egg-info/SOURCES.txt +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser.egg-info/dependency_links.txt +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser.egg-info/entry_points.txt +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser.egg-info/requires.txt +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser.egg-info/top_level.txt +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_all_formulas.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_api_change.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_borders.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_bullets.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_cat_numbers.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_categories.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_comments.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_coverage.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_create_cells.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_csv2numbers.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_currency.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_encrypted.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_folder.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_formulas.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_large.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_local_docs.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_memory_leaks.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_merges.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_package.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_properties.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_roman.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_save.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_slices.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_styles.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_table_size.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_tables.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_unsupported.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_uuids.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_version.py +0 -0
- {numbers_parser-4.22.0 → numbers_parser-4.22.2}/tests/test_write_empty_cell.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: numbers-parser
|
|
3
|
-
Version: 4.22.
|
|
3
|
+
Version: 4.22.2
|
|
4
4
|
Summary: Read and write Apple Numbers spreadsheets
|
|
5
5
|
Author-email: Jon Connell <python@figsandfudge.com>
|
|
6
6
|
License-Expression: MIT
|
|
@@ -313,9 +313,9 @@ Columns of data can have a number of transformations applied to them. The primar
|
|
|
313
313
|
|
|
314
314
|
```text
|
|
315
315
|
usage: csv2numbers [-h] [-V] [--whitespace] [--reverse] [--no-header]
|
|
316
|
-
[--day-first] [--date COLUMNS] [--
|
|
317
|
-
[--
|
|
318
|
-
[-o [FILENAME ...]]
|
|
316
|
+
[--day-first] [--date COLUMNS] [--encoding ENCODING]
|
|
317
|
+
[--rename COLUMNS-MAP] [--transform COLUMNS-MAP]
|
|
318
|
+
[--delete COLUMNS] [-o [FILENAME ...]]
|
|
319
319
|
[csvfile ...]
|
|
320
320
|
|
|
321
321
|
positional arguments:
|
|
@@ -404,7 +404,6 @@ Current known limitations of `numbers-parser` which may be implemented in the fu
|
|
|
404
404
|
- New tables are inserted with a fixed offset below the last table in a worksheet which does not take into account title or caption size
|
|
405
405
|
- Captions can be created and edited as of numbers-parser version 4.12, but cannot be styled. New captions adopt the first caption style available in the current document
|
|
406
406
|
- Formulas cannot be written to a document
|
|
407
|
-
- Pivot tables are unsupported and saving a document with a pivot table issues a UnsupportedWarning (see [issue 73](https://github.com/masaccio/numbers-parser/issues/73) for details).
|
|
408
407
|
- Tables which have been saved grouped cannot be safely edited as references to written cells refer to the ungrouped cell rows rather than the row number in the groups.
|
|
409
408
|
|
|
410
409
|
The following limitations are expected to always remain:
|
|
@@ -287,9 +287,9 @@ Columns of data can have a number of transformations applied to them. The primar
|
|
|
287
287
|
|
|
288
288
|
```text
|
|
289
289
|
usage: csv2numbers [-h] [-V] [--whitespace] [--reverse] [--no-header]
|
|
290
|
-
[--day-first] [--date COLUMNS] [--
|
|
291
|
-
[--
|
|
292
|
-
[-o [FILENAME ...]]
|
|
290
|
+
[--day-first] [--date COLUMNS] [--encoding ENCODING]
|
|
291
|
+
[--rename COLUMNS-MAP] [--transform COLUMNS-MAP]
|
|
292
|
+
[--delete COLUMNS] [-o [FILENAME ...]]
|
|
293
293
|
[csvfile ...]
|
|
294
294
|
|
|
295
295
|
positional arguments:
|
|
@@ -378,7 +378,6 @@ Current known limitations of `numbers-parser` which may be implemented in the fu
|
|
|
378
378
|
- New tables are inserted with a fixed offset below the last table in a worksheet which does not take into account title or caption size
|
|
379
379
|
- Captions can be created and edited as of numbers-parser version 4.12, but cannot be styled. New captions adopt the first caption style available in the current document
|
|
380
380
|
- Formulas cannot be written to a document
|
|
381
|
-
- Pivot tables are unsupported and saving a document with a pivot table issues a UnsupportedWarning (see [issue 73](https://github.com/masaccio/numbers-parser/issues/73) for details).
|
|
382
381
|
- Tables which have been saved grouped cannot be safely edited as references to written cells refer to the ungrouped cell rows rather than the row number in the groups.
|
|
383
382
|
|
|
384
383
|
The following limitations are expected to always remain:
|
|
@@ -24,7 +24,7 @@ classifiers = [
|
|
|
24
24
|
description = "Read and write Apple Numbers spreadsheets"
|
|
25
25
|
name = "numbers-parser"
|
|
26
26
|
readme = "README.md"
|
|
27
|
-
version = "4.22.
|
|
27
|
+
version = "4.22.2"
|
|
28
28
|
|
|
29
29
|
[project.urls]
|
|
30
30
|
repository = "https://github.com/masaccio/numbers-parser"
|
|
@@ -48,6 +48,7 @@ dev = [
|
|
|
48
48
|
"python-magic>=0.4",
|
|
49
49
|
"colorama<1.0.0,>=0.4.6",
|
|
50
50
|
"pympler<2.0,>=1.1",
|
|
51
|
+
"pre-commit>=4.6.2",
|
|
51
52
|
]
|
|
52
53
|
docs = [
|
|
53
54
|
"sphinx<9.0,>=7.3",
|
|
@@ -56,6 +57,7 @@ docs = [
|
|
|
56
57
|
"sphinx-nefertiti>=0.7",
|
|
57
58
|
"sphinx-markdown-builder>=0.6",
|
|
58
59
|
"sphinx-copybutton>=0.5.2",
|
|
60
|
+
"sphinxcontrib-mermaid>=2.1.1",
|
|
59
61
|
# Security updates
|
|
60
62
|
"urllib3>=2.7.0",
|
|
61
63
|
"filelock>=3.20.1",
|
|
@@ -36,7 +36,15 @@ class NumbersUnpacker(IWorkHandler):
|
|
|
36
36
|
def store_file(self, filename: str, blob: bytes) -> None:
|
|
37
37
|
"""Store a protobuf archive."""
|
|
38
38
|
filename = re.sub(r".*\.numbers/", "", str(filename))
|
|
39
|
-
|
|
39
|
+
|
|
40
|
+
# Resolve absolute paths to prevent Zip Slip
|
|
41
|
+
out_abs = os.path.realpath(self.output_dir)
|
|
42
|
+
target_abs = os.path.realpath(os.path.join(out_abs, filename))
|
|
43
|
+
if os.path.commonpath([out_abs, target_abs]) != out_abs:
|
|
44
|
+
msg = f"Path traversal attempt detected in archive member: {filename}"
|
|
45
|
+
raise FileFormatError(msg)
|
|
46
|
+
|
|
47
|
+
self.ensure_directory_exists(target_abs)
|
|
40
48
|
target_path = os.path.join(self.output_dir, filename)
|
|
41
49
|
if isinstance(blob, IWAFile):
|
|
42
50
|
target_path = target_path.replace(".iwa", "")
|
|
@@ -100,7 +108,7 @@ class NumbersUnpacker(IWorkHandler):
|
|
|
100
108
|
elif k in ["cell_storage_buffer", "cell_storage_buffer_pre_bnc"]:
|
|
101
109
|
obj[k] = str(hexlify(b64decode(obj[k]), sep=":"))
|
|
102
110
|
obj[k] = obj[k].replace("b'", "").replace("'", "")
|
|
103
|
-
elif k in ["cell_offsets",
|
|
111
|
+
elif k in ["cell_offsets", "cell_offsets_pre_bnc"]:
|
|
104
112
|
offsets = array("h", b64decode(obj[k])).tolist()
|
|
105
113
|
obj[k] = ",".join([str(x) for x in offsets])
|
|
106
114
|
obj[k] = re.sub(r"(?:,-1)+$", ",[...]", obj[k])
|
|
@@ -2071,35 +2071,31 @@ def _format_base(value: float, number_format) -> str:
|
|
|
2071
2071
|
return formatted_value.zfill(number_format.base_places)
|
|
2072
2072
|
|
|
2073
2073
|
|
|
2074
|
-
def
|
|
2075
|
-
|
|
2076
|
-
|
|
2077
|
-
|
|
2078
|
-
return
|
|
2079
|
-
|
|
2080
|
-
|
|
2081
|
-
if numerator == denominator:
|
|
2082
|
-
return "1"
|
|
2083
|
-
return f"{numerator}/{denominator}"
|
|
2074
|
+
def _format_fraction_parts(whole: int, numerator: int, denominator: int) -> str:
|
|
2075
|
+
"""Return the simplest fraction for the given whole, numerator and denominator."""
|
|
2076
|
+
whole, numerator = abs(whole), abs(numerator)
|
|
2077
|
+
if not numerator:
|
|
2078
|
+
return str(whole)
|
|
2079
|
+
fraction = f"{numerator}/{denominator}"
|
|
2080
|
+
return f"{whole} {fraction}" if whole else fraction
|
|
2084
2081
|
|
|
2085
2082
|
|
|
2086
2083
|
def _float_to_fraction(value: float, denominator: int) -> str:
|
|
2087
2084
|
"""Convert a float to the nearest fraction and return as a string."""
|
|
2088
|
-
|
|
2089
|
-
|
|
2090
|
-
|
|
2085
|
+
numerator = round(abs(value) * denominator)
|
|
2086
|
+
whole, rem = divmod(numerator, denominator)
|
|
2087
|
+
|
|
2088
|
+
result = _format_fraction_parts(whole, rem, denominator)
|
|
2089
|
+
return f"-{result}" if value < 0 and result != "0" else result
|
|
2091
2090
|
|
|
2092
2091
|
|
|
2093
2092
|
def _float_to_n_digit_fraction(value: float, max_digits: int) -> str:
|
|
2094
|
-
"""
|
|
2095
|
-
|
|
2096
|
-
|
|
2097
|
-
|
|
2098
|
-
|
|
2099
|
-
|
|
2100
|
-
whole = int(value)
|
|
2101
|
-
numerator -= whole * denominator
|
|
2102
|
-
return _format_fraction_parts_to(whole, numerator, denominator)
|
|
2093
|
+
"""Convert a float to a fraction of a maximum number of digits and return as a string."""
|
|
2094
|
+
fraction = Fraction(abs(value)).limit_denominator(10**max_digits - 1)
|
|
2095
|
+
whole, numerator = divmod(fraction.numerator, fraction.denominator)
|
|
2096
|
+
|
|
2097
|
+
result = _format_fraction_parts(whole, numerator, fraction.denominator)
|
|
2098
|
+
return f"-{result}" if value < 0 and result != "0" else result
|
|
2103
2099
|
|
|
2104
2100
|
|
|
2105
2101
|
def _format_fraction(value: float, number_format) -> str:
|
|
@@ -159,6 +159,13 @@ class Document:
|
|
|
159
159
|
If attempting to write a package into a folder that is not an
|
|
160
160
|
existing Numbers document.
|
|
161
161
|
|
|
162
|
+
Warns
|
|
163
|
+
-----
|
|
164
|
+
RuntimeWarning:
|
|
165
|
+
If saving a document that contains a pivot table. ``numbers-parser`` will
|
|
166
|
+
automatically update the coordinate metadata so that pivot tables can be
|
|
167
|
+
safely refreshed in Numbers, but this is considered unproven functionality.
|
|
168
|
+
|
|
162
169
|
"""
|
|
163
170
|
self.filename = filename
|
|
164
171
|
for sheet in self.sheets:
|
|
@@ -364,7 +364,7 @@ class IWork:
|
|
|
364
364
|
else:
|
|
365
365
|
with sub_filepath.open(mode="rb") as fh:
|
|
366
366
|
blob = fh.read()
|
|
367
|
-
package_filename = re.sub(r"
|
|
367
|
+
package_filename = re.sub(r".*?\.numbers/*", "", str(sub_filepath))
|
|
368
368
|
self._store_blob(package_filename, blob)
|
|
369
369
|
|
|
370
370
|
def _read_package_encryption(self, filepath: Path) -> None:
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: numbers-parser
|
|
3
|
-
Version: 4.22.
|
|
3
|
+
Version: 4.22.2
|
|
4
4
|
Summary: Read and write Apple Numbers spreadsheets
|
|
5
5
|
Author-email: Jon Connell <python@figsandfudge.com>
|
|
6
6
|
License-Expression: MIT
|
|
@@ -313,9 +313,9 @@ Columns of data can have a number of transformations applied to them. The primar
|
|
|
313
313
|
|
|
314
314
|
```text
|
|
315
315
|
usage: csv2numbers [-h] [-V] [--whitespace] [--reverse] [--no-header]
|
|
316
|
-
[--day-first] [--date COLUMNS] [--
|
|
317
|
-
[--
|
|
318
|
-
[-o [FILENAME ...]]
|
|
316
|
+
[--day-first] [--date COLUMNS] [--encoding ENCODING]
|
|
317
|
+
[--rename COLUMNS-MAP] [--transform COLUMNS-MAP]
|
|
318
|
+
[--delete COLUMNS] [-o [FILENAME ...]]
|
|
319
319
|
[csvfile ...]
|
|
320
320
|
|
|
321
321
|
positional arguments:
|
|
@@ -404,7 +404,6 @@ Current known limitations of `numbers-parser` which may be implemented in the fu
|
|
|
404
404
|
- New tables are inserted with a fixed offset below the last table in a worksheet which does not take into account title or caption size
|
|
405
405
|
- Captions can be created and edited as of numbers-parser version 4.12, but cannot be styled. New captions adopt the first caption style available in the current document
|
|
406
406
|
- Formulas cannot be written to a document
|
|
407
|
-
- Pivot tables are unsupported and saving a document with a pivot table issues a UnsupportedWarning (see [issue 73](https://github.com/masaccio/numbers-parser/issues/73) for details).
|
|
408
407
|
- Tables which have been saved grouped cannot be safely edited as references to written cells refer to the ungrouped cell rows rather than the row number in the groups.
|
|
409
408
|
|
|
410
409
|
The following limitations are expected to always remain:
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
from collections.abc import Generator
|
|
1
2
|
from datetime import datetime, timedelta
|
|
2
3
|
|
|
3
4
|
import pytest
|
|
4
5
|
import pytest_check as check
|
|
5
6
|
|
|
6
7
|
from numbers_parser import (
|
|
8
|
+
Cell,
|
|
7
9
|
ControlFormattingType,
|
|
8
10
|
Document,
|
|
9
11
|
DurationStyle,
|
|
@@ -376,7 +378,7 @@ def test_custom_formatting(pytestconfig):
|
|
|
376
378
|
raise AssertionError
|
|
377
379
|
|
|
378
380
|
|
|
379
|
-
def
|
|
381
|
+
def test_custom_formatting_stress(pytestconfig):
|
|
380
382
|
if pytestconfig.getoption("max_check_fails") is not None:
|
|
381
383
|
max_check_fails = pytestconfig.getoption("max_check_fails")
|
|
382
384
|
else:
|
|
@@ -397,6 +399,31 @@ def test_formatting_stress(pytestconfig):
|
|
|
397
399
|
raise AssertionError
|
|
398
400
|
|
|
399
401
|
|
|
402
|
+
def test_standard_formatting_stress():
|
|
403
|
+
def chunks(cells: list[Cell]) -> Generator[tuple[int, Cell, str]]:
|
|
404
|
+
for ii in range(0, len(cells), 2):
|
|
405
|
+
yield (ii, cells[ii], cells[ii + 1].formatted_value)
|
|
406
|
+
|
|
407
|
+
doc = Document("tests/data/standard-format-stress.numbers")
|
|
408
|
+
for sheet in doc.sheets:
|
|
409
|
+
table = sheet.tables[0]
|
|
410
|
+
for cells in table.iter_rows(min_row=1):
|
|
411
|
+
test_name = f"{sheet.name}:{cells[0].value}"
|
|
412
|
+
if not test_name:
|
|
413
|
+
continue
|
|
414
|
+
raw_value = cells[1].value
|
|
415
|
+
for idx, cell, formatted_value in chunks(cells[2:]):
|
|
416
|
+
if isinstance(cell, EmptyCell):
|
|
417
|
+
continue
|
|
418
|
+
subtest_name = table.cell(0, idx + 2).value
|
|
419
|
+
check.equal(cell.value, raw_value, f"{test_name}:{subtest_name}:raw")
|
|
420
|
+
check.equal(
|
|
421
|
+
formatted_value,
|
|
422
|
+
cell.formatted_value,
|
|
423
|
+
(f"{test_name}:{subtest_name}:formatted"),
|
|
424
|
+
)
|
|
425
|
+
|
|
426
|
+
|
|
400
427
|
def test_write_date_format(configurable_save_file):
|
|
401
428
|
doc = Document(
|
|
402
429
|
num_header_cols=0,
|
|
@@ -981,3 +981,10 @@ def test_issue_256():
|
|
|
981
981
|
"-1/2",
|
|
982
982
|
"-2",
|
|
983
983
|
]
|
|
984
|
+
|
|
985
|
+
|
|
986
|
+
def test_issue_266():
|
|
987
|
+
doc = Document("tests/data/issue-266.numbers")
|
|
988
|
+
table = doc.default_table
|
|
989
|
+
for row in range(table.num_rows):
|
|
990
|
+
assert table.cell(row, 1).formatted_value == table.cell(row, 2).value
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import json
|
|
2
|
+
import plistlib
|
|
2
3
|
import runpy
|
|
3
4
|
import sys
|
|
5
|
+
import zipfile
|
|
4
6
|
from pathlib import Path
|
|
5
7
|
from unittest.mock import patch
|
|
6
8
|
|
|
@@ -8,6 +10,8 @@ import magic
|
|
|
8
10
|
import pytest
|
|
9
11
|
|
|
10
12
|
from numbers_parser import __version__
|
|
13
|
+
from numbers_parser._unpack_numbers import NumbersUnpacker
|
|
14
|
+
from numbers_parser.exceptions import FileFormatError
|
|
11
15
|
|
|
12
16
|
|
|
13
17
|
def test_version(script_runner):
|
|
@@ -195,8 +199,11 @@ def test_pretty_storage(script_runner, tmp_path):
|
|
|
195
199
|
with open(str(output_dir / "Index/Tables/Tile-875165.json")) as f:
|
|
196
200
|
data = json.load(f)
|
|
197
201
|
objects = data["chunks"][0]["archives"][0]["objects"][0]
|
|
198
|
-
|
|
199
|
-
assert
|
|
202
|
+
rowinfo = objects["rowInfos"][0]
|
|
203
|
+
assert rowinfo["cell_offsets"] == "-1,0,24,48,72,96,[...]"
|
|
204
|
+
assert rowinfo["cell_offsets_pre_bnc"] == "-1,0,20,40,60,80,[...]"
|
|
205
|
+
assert rowinfo["cell_storage_buffer"][0:26] == "05:03:00:00:00:00:00:00:08"
|
|
206
|
+
assert rowinfo["cell_storage_buffer_pre_bnc"][0:26] == "04:03:00:00:14:00:00:00:00"
|
|
200
207
|
|
|
201
208
|
|
|
202
209
|
def test_compact_json(script_runner, tmp_path):
|
|
@@ -287,3 +294,25 @@ def test_default_output_dir(script_runner, tmp_path):
|
|
|
287
294
|
assert ret.stdout == ""
|
|
288
295
|
assert ret.stderr == ""
|
|
289
296
|
assert Path.exists(tmp_path / "test-1/Metadata/Properties.plist")
|
|
297
|
+
|
|
298
|
+
|
|
299
|
+
def test_unpack_path_traversal_prevention(tmp_path):
|
|
300
|
+
evil_file = tmp_path / "evil.numbers"
|
|
301
|
+
with zipfile.ZipFile(evil_file, "w") as z:
|
|
302
|
+
z.writestr("Metadata/Properties.plist", plistlib.dumps({}))
|
|
303
|
+
z.writestr("Metadata/BuildVersionHistory.plist", plistlib.dumps([]))
|
|
304
|
+
z.writestr("../escape_target/PWNED", b"marker")
|
|
305
|
+
|
|
306
|
+
output_dir = tmp_path / "out"
|
|
307
|
+
output_dir.mkdir()
|
|
308
|
+
escape_target_dir = tmp_path / "escape_target"
|
|
309
|
+
|
|
310
|
+
unpacker = NumbersUnpacker(output_dir=str(output_dir))
|
|
311
|
+
|
|
312
|
+
with pytest.raises(FileFormatError, match="Path traversal attempt detected"): # noqa: PT012, SIM117
|
|
313
|
+
with zipfile.ZipFile(evil_file, "r") as z:
|
|
314
|
+
for filename in z.namelist():
|
|
315
|
+
blob = z.read(filename)
|
|
316
|
+
unpacker.store_file(filename, blob)
|
|
317
|
+
|
|
318
|
+
assert not (escape_target_dir / "PWNED").exists()
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TNArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TNArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSAArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSAArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCEArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCH3DArchives_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCHArchives_GEN_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCHArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCHArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCKArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSCKArchives_sos_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSDArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSDArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSKArchives_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSPMessages_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSSArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSSArchives_sos_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSTArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSTArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSWPArchives_pb2.py
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser/generated/TSWPArchives_sos_pb2.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser.egg-info/dependency_links.txt
RENAMED
|
File without changes
|
{numbers_parser-4.22.0 → numbers_parser-4.22.2}/src/numbers_parser.egg-info/entry_points.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|