numbers-parser 4.4.0__tar.gz → 4.4.2__tar.gz

{numbers_parser-4.4.0 → numbers_parser-4.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: numbers-parser
-Version: 4.4.0
+Version: 4.4.2
 Summary: Read and write Apple Numbers spreadsheets
 Home-page: https://github.com/masaccio/numbers-parser
 License: MIT

{numbers_parser-4.4.0 → numbers_parser-4.4.2}/pyproject.toml

@@ -12,7 +12,7 @@ name = "numbers-parser"
 packages = [{include = "numbers_parser", from = "src"}]
 readme = "README.md"
 repository = "https://github.com/masaccio/numbers-parser"
-version = "4.4.0"
+version = "4.4.2"
 
 [tool.poetry.scripts]
 cat-numbers = "numbers_parser._cat_numbers:main"

{numbers_parser-4.4.0 → numbers_parser-4.4.2}/src/numbers_parser/_cat_numbers.py

@@ -1,13 +1,19 @@
 import argparse
 import csv
 import logging
+import sigfig
 import sys
 
-from numbers_parser import Document, _get_version
+from numbers_parser import (
+    Document,
+    _get_version,
+    NumberCell,
+    ErrorCell,
+    FileFormatError,
+)
 from numbers_parser import __name__ as numbers_parser_name
 from numbers_parser.experimental import _enable_experimental_features
-from numbers_parser.exceptions import FileFormatError
-from numbers_parser.cell import ErrorCell
+from numbers_parser.constants import MAX_SIGNIFICANT_DIGITS
 
 logger = logging.getLogger(numbers_parser_name)
 
@@ -73,12 +79,14 @@ def print_table_names(filename):
 
 
 def cell_as_string(args, cell):
-    if type(cell) == ErrorCell and not (args.formulas):
+    if isinstance(cell, ErrorCell) and not (args.formulas):
         return "#REF!"
     elif args.formulas and cell.formula is not None:
         return cell.formula
     elif 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:
         return ""
     else:

{numbers_parser-4.4.0 → numbers_parser-4.4.2}/src/numbers_parser/cell_storage.py

@@ -529,12 +529,8 @@ def expand_quotes(value: str) -> str:
     return formatted_value
 
 
-# import inspect
-
-
 def decode_number_format(format, value, name):  # noqa: C901
     """Parse a custom date format string and return a formatted number value"""
-    # cell = inspect.currentframe().f_back.f_back.f_back.f_locals["self"]
     custom_format_string = format.custom_format_string
     value *= format.scale_factor
     if "%" in custom_format_string and format.scale_factor == 1.0:
@@ -614,8 +610,17 @@ def decode_number_format(format, value, name):  # noqa: C901
         int_pad = None
         int_width = num_integers
 
-    # if num_integers == 0 and dec_pad == CellPadding.SPACE:
-    #     dec_pad = CellPadding.ZERO
+    # value_1 = str(value).split(".")[0]
+    # value_2 = sigfig.round(str(value).split(".")[1], sigfig=MAX_SIGNIFICANT_DIGITS, warn=False)
+    # int_pad_space_as_zero = (
+    #     num_integers > 0
+    #     and num_decimals > 0
+    #     and int_pad == CellPadding.SPACE
+    #     and dec_pad is None
+    #     and num_integers > len(value_1)
+    #     and num_decimals > len(value_2)
+    # )
+    int_pad_space_as_zero = False
 
     # Formatting integer zero:
     #   Blank (padded if needed) if int_pad is SPACE and no decimals
@@ -637,7 +642,7 @@ def decode_number_format(format, value, name):  # noqa: C901
         and len(str(decimal)) > num_decimals
     ):
         formatted_value = "".rjust(int_width)
-    elif int_pad == CellPadding.ZERO:
+    elif int_pad_space_as_zero or int_pad == CellPadding.ZERO:
         if format.show_thousands_separator:
             formatted_value = f"{integer:0{int_width},}"
         else:

{numbers_parser-4.4.0 → numbers_parser-4.4.2}/src/numbers_parser/document.py

@@ -224,6 +224,14 @@ class Table:
         """Set the table's name"""
         self._model.table_name(self._table_id, value)
 
+    @property
+    def table_name_enabled(self):
+        return self._model.table_name_enabled(self._table_id)
+
+    @table_name_enabled.setter
+    def table_name_enabled(self, enabled):
+        self._model.table_name_enabled(self._table_id, enabled)
+
     @property
     def num_header_rows(self) -> int:
         """Return the number of header rows"""

{numbers_parser-4.4.0 → numbers_parser-4.4.2}/src/numbers_parser/model.py

@@ -321,6 +321,12 @@ class _NumbersModel:
         else:
             self.objects[table_id].table_name = value
 
+    def table_name_enabled(self, table_id: int, enabled: bool = None):
+        if enabled is not None:
+            self.objects[table_id].table_name_enabled = enabled
+        else:
+            return self.objects[table_id].table_name_enabled
+
     @lru_cache(maxsize=None)
     def table_tiles(self, table_id):
         bds = self.objects[table_id].base_data_store