fixup! FEAT: heavily refactored array model, adapter code and widget code

Author: gdementen

larray_editor/arraywidget.py

@@ -458,7 +458,7 @@ def set_default_size(self):
     # Also, overriding the general event() method for this does not work as it is
     # handled behind us (by the ScrollArea I assume) and we do not even see the event
     # unless we are at the buffer boundary.
-    def wheelEvent(self, event):
+    def wheelEvent(self, event: QWheelEvent):
         """Catch wheel events and send them to the corresponding visible scrollbar"""
         delta = event.angleDelta()
         logger.debug(f"wheelEvent on {self.__class__.__name__} ({delta})")

larray_editor/utils.py

@@ -1,4 +1,3 @@
-import locale
 import inspect
 import os.path
 import os
@@ -598,100 +597,6 @@ def broadcast_get(seq, row, col):
         return seq
 
 
-
-def create_formatter(fmt):
-    """Creates a value formatter based on a format string.
-
-    In addition to Python builtin format specifiers, this function supports
-    the 'm' specifier which use locale-aware separators for thousands and
-    decimals (like the builtin 'n' specifier) but does not use scientific
-    format and allows specifying a fixed number of decimals, unlike the 'n'
-    specifier.
-
-    The desired presence of thousands separators should be given by a
-    comma (',') in the format string, whether or not a comma is the
-    separator used for the current system locale.
-
-    Using 'm' as the specifier in the hope that it gets one day supported by
-    CPython : https://github.com/python/cpython/issues/79819
-
-    Parameters
-    ----------
-    fmt : str
-        The format string, e.g., "{:,.2m}".
-
-    Returns
-    -------
-    function
-        A function that takes a value and returns it formatted as a string.
-
-    References
-    ----------
-    * https://docs.python.org/3/library/string.html#formatspec
-
-    Examples
-    --------
-    >>> import locale, doctest
-    >>> try:
-    ...     _ = locale.setlocale(locale.LC_NUMERIC, 'be_FR.UTF-8')
-    ... except locale.Error:
-    ...     raise doctest.SkipTest("be_FR.UTF-8 locale not available")
-    >>> value = 1234.567
-    >>> create_formatter("{:,.2f}")(value)  # US style
-    '1,234.57'
-    >>> create_formatter("{:,.2m}")(value)  # EU style
-    '1.234,57'
-    >>> create_formatter("{:.2f}")(value)  # No thousand separator - US style
-    '1234.57'
-    >>> create_formatter("{:.2m}")(value)  # No thousand separator - EU style
-    '1234,57'
-    >>> create_formatter("{:,f}")(value)   # 6 decimals by default - US style
-    '1,234.567000'
-    >>> create_formatter("{:,m}")(value)   # 6 decimals by default - EU style
-    '1.234,567000'
-
-    Robust to separators in the format string (outside the format_spec)
-
-    >>> create_formatter(",,, {:,.0f} ...")(value)  # 0 decimals - US style
-    ',,, 1,235 ...'
-    >>> create_formatter(",,, {:,.0m} ...")(value)  # 0 decimals - EU style
-    ',,, 1.235 ...'
-    """
-    match_m_specifier = M_SPECIFIER_PATTERN.search(fmt)
-    if match_m_specifier is None:
-        return fmt.format
-
-    locale.setlocale(locale.LC_NUMERIC, "")  # Use system locale
-    localeconv = locale.localeconv()
-    locale_thousands_sep = localeconv["thousands_sep"]
-    locale_decimal_point = localeconv["decimal_point"]
-
-    if locale_decimal_point == "." and locale_thousands_sep == ",":
-        return fmt.format
-
-    head = fmt[:match_m_specifier.start(0)]
-    tail = fmt[match_m_specifier.end(0):]
-    field = match_m_specifier.group('field')
-    format_spec = match_m_specifier.group('format_spec')
-    value_format = f"{{{field}:{format_spec}f}}"
-    value_formatter = value_format.format
-    # use a nul byte as placeholder to avoid conflicts with other "normal" characters
-    placeholder = '\x00'
-
-    # we intentionally do not handle *args and **kwargs because that could give the
-    # impression we support multiple {} in the format string, which we don't
-    def formatter(value):
-        # * using + is a tad faster than using ''.join in this case
-        # * chained replaces are ugly but faster than str.make_trans and then str.translate
-        return (head +
-                value_formatter(value)
-                    .replace('.', placeholder)
-                    .replace(',', locale_thousands_sep)
-                    .replace(placeholder, locale_decimal_point) +
-                tail)
-    return formatter
-
-
 # The following two functions (_allow_interrupt and _allow_interrupt_qt) are
 # copied from matplotlib code, because they are not part of their public API
 # and relying on them would require us to pin the matplotlib version, which