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

numbers_parser/constants.py

@@ -1,8 +1,9 @@
 from collections import OrderedDict
+from datetime import datetime
 from enum import IntEnum
+from math import ceil
 
 import enum_tools.documentation
-from pendulum import datetime
 
 try:
     from importlib.resources import files
@@ -64,7 +65,7 @@ DOCUMENT_ID = 1
 PACKAGE_ID = 2
 
 # System constants
-EPOCH = datetime(2001, 1, 1)
+EPOCH = datetime(2001, 1, 1)  # noqa: DTZ001
 SECONDS_IN_HOUR = 60 * 60
 SECONDS_IN_DAY = SECONDS_IN_HOUR * 24
 SECONDS_IN_WEEK = SECONDS_IN_DAY * 7
@@ -89,6 +90,7 @@ SUPPORTED_NUMBERS_VERSIONS = [
     "14.0",
     "14.1",
     "14.2",
+    "14.3",
 ]
 
 
@@ -99,6 +101,16 @@ def _days_occurred_in_month(value: datetime) -> str:
     return str(n_days)
 
 
+def _day_of_year(value: datetime) -> int:
+    """Return the day number in a year for a datetime."""
+    return value.timetuple().tm_yday
+
+
+def _week_of_month(value: datetime) -> int:
+    """Return the week number in a month for a datetime."""
+    return int(ceil((value.day + value.replace(day=1).weekday()) / 7.0))
+
+
 DATETIME_FIELD_MAP = OrderedDict(
     [
         ("a", lambda x: x.strftime("%p").lower()),
@@ -113,9 +125,9 @@ DATETIME_FIELD_MAP = OrderedDict(
         ("M", "%-m"),
         ("d", "%-d"),
         ("dd", "%d"),
-        ("DDD", lambda x: str(x.day_of_year).zfill(3)),
-        ("DD", lambda x: str(x.day_of_year).zfill(2)),
-        ("D", lambda x: str(x.day_of_year).zfill(1)),
+        ("DDD", lambda x: str(_day_of_year(x)).zfill(3)),
+        ("DD", lambda x: str(_day_of_year(x)).zfill(2)),
+        ("D", lambda x: str(_day_of_year(x)).zfill(1)),
         ("HH", "%H"),
         ("H", "%-H"),
         ("hh", "%I"),
@@ -128,7 +140,7 @@ DATETIME_FIELD_MAP = OrderedDict(
         ("m", lambda x: str(x.minute)),
         ("ss", "%S"),
         ("s", lambda x: str(x.second)),
-        ("W", lambda x: str(x.week_of_month - 1)),
+        ("W", lambda x: str(_week_of_month(x) - 1)),
         ("ww", "%W"),
         ("G", "AD"),  # TODO: support BC
         ("F", lambda x: _days_occurred_in_month(x)),
@@ -258,7 +270,8 @@ CUSTOM_FORMATTING_ALLOWED_CELLS = {
 
 @enum_tools.documentation.document_enum
 class NegativeNumberStyle(IntEnum):
-    """How negative numbers are formatted.
+    """
+    How negative numbers are formatted.
 
     This enum is used in cell data formats and cell custom formats using the
     `negative_style` keyword argument.
@@ -276,7 +289,8 @@ class NegativeNumberStyle(IntEnum):
 
 @enum_tools.documentation.document_enum
 class FractionAccuracy(IntEnum):
-    """How fractions are formatted.
+    """
+    How fractions are formatted.
 
     This enum is used in cell data formats and cell custom formats using the
     `fraction_accuracy` keyword argument.

numbers_parser/containers.py

@@ -10,7 +10,7 @@ from numbers_parser.iwork import IWork, IWorkHandler
 class ItemsList:
     def __init__(self, model, refs, item_class) -> None:
         self._item_name = item_class.__name__.lower()
-        self._items = [item_class(model, id) for id in refs]
+        self._items = [item_class(model, x) for x in refs]
 
     def __getitem__(self, key: int):
         if isinstance(key, int):
@@ -20,16 +20,15 @@ class ItemsList:
                 msg = f"index {key} out of range"
                 raise IndexError(msg)
             return self._items[key]
-        elif isinstance(key, str):
+        if isinstance(key, str):
             for item in self._items:
                 if item.name == key:
                     return item
             msg = f"no {self._item_name} named '{key}'"
             raise KeyError(msg)
-        else:
-            t = type(key).__name__
-            msg = f"invalid index type {t}"
-            raise LookupError(msg)
+        t = type(key).__name__
+        msg = f"invalid index type {t}"
+        raise LookupError(msg)
 
     def __len__(self) -> int:
         return len(self._items)
@@ -37,7 +36,7 @@ class ItemsList:
     def __contains__(self, key) -> bool:
         return key.lower() in [x.name.lower() for x in self._items]
 
-    def append(self, item):
+    def append(self, item) -> None:
         self._items.append(item)
 
 
@@ -79,7 +78,8 @@ class ObjectStore(IWorkHandler):
         return self._max_id
 
     def create_object_from_dict(self, iwa_file: str, object_dict: dict, cls: object, append=False):
-        """Create a new object and store the associated IWA segment. Return the
+        """
+        Create a new object and store the associated IWA segment. Return the
         message ID for the object and the newly created object. If the IWA
         file cannot be found, it will be created.
         """
@@ -100,8 +100,9 @@ class ObjectStore(IWorkHandler):
         self._object_to_filename_map[new_id] = iwa_pathname
         return new_id, self._objects[new_id]
 
-    def update_object_file_store(self):
-        """Copy the protobuf messages from any updated object to the cached
+    def update_object_file_store(self) -> None:
+        """
+        Copy the protobuf messages from any updated object to the cached
         version in the file store so this can be saved to a new document.
         """
         for obj_id in self._objects: