sciform 0.38.2__py3-none-any.whl → 0.39.0__py3-none-any.whl

sciform/api/formatter.py

@@ -118,7 +118,6 @@ class Formatter:
      'left_pad_dec_place': 0,
      'exp_format': 'standard',
      'extra_si_prefixes': {},
-     'extra_iec_prefixes': {},
      'extra_parts_per_forms': {},
      'capitalize': False,
      'superscript': True,
@@ -153,7 +152,6 @@ class Formatter:
         left_pad_dec_place: int | None = None,
         exp_format: option_types.ExpFormat | None = None,
         extra_si_prefixes: dict[int, str] | None = None,
-        extra_iec_prefixes: dict[int, str] | None = None,
         extra_parts_per_forms: dict[int, str] | None = None,
         capitalize: bool | None = None,
         superscript: bool | None = None,
@@ -180,7 +178,6 @@ class Formatter:
           * ``exp_val`` must be 0 for fixed point and percent modes
           * ``exp_val`` must be a multiple of 3 for engineering and
             shifted engineering modes
-          * ``exp_val`` must be a multiple of 10 for binary iec mode
 
         * ``upper_separator`` may be any of ``['', ',', '.', ' ', '_']``
           but must be different from ``decimal_separator``
@@ -189,13 +186,12 @@ class Formatter:
 
         :param exp_mode: Specify the exponent formatting mode.
         :type exp_mode: ``Literal['fixed_point', 'percent',
-          'scientific', 'engineering', 'engineering_shifted', 'binary',
-          'binary_iec'] | None``
+          'scientific', 'engineering', 'engineering_shifted'] | None``
         :param exp_val: Indicates how the exponent value should be
           chosen. If an integer is specified, the value must be 0 for
           fixed point and percent modes, an integer multiple of 3 for
-          engineering and engineering shifted modes, and an integer
-          multiple of 10 for binary IEC mode. Can be set to ``"auto"``.
+          engineering and engineering shifted modes. Can be set to
+          ``"auto"``.
         :type exp_val: ``int | Literal['auto'] | None``
         :param round_mode: Indicate how to round numbers during
           formatting.
@@ -231,11 +227,6 @@ class Formatter:
           values to si prefixes. Entries overwrite default values. A
           value of ``None`` means that exponent will not be converted.
         :type extra_si_prefixes: ``dict[int, Union[str, None]] | None``
-        :param extra_iec_prefixes: Dictionary mapping additional
-          exponent values to iec prefixes. Entries overwrite default
-          values. A value of ``None`` means that exponent will not be
-          converted.
-        :type extra_iec_prefixes: ``dict[int, Union[str, None]] | None``
         :param extra_parts_per_forms: Dictionary mapping additional
           exponent values to "parts-per" forms. Entries overwrite
           default values. A value of ``None`` means that exponent will
@@ -297,7 +288,6 @@ class Formatter:
             left_pad_dec_place=left_pad_dec_place,
             exp_format=exp_format,
             extra_si_prefixes=extra_si_prefixes,
-            extra_iec_prefixes=extra_iec_prefixes,
             extra_parts_per_forms=extra_parts_per_forms,
             capitalize=capitalize,
             superscript=superscript,

sciform/api/global_configuration.py

@@ -38,7 +38,6 @@ def set_global_options(  # noqa: PLR0913
     left_pad_dec_place: int | None = None,
     exp_format: option_types.ExpFormat | None = None,
     extra_si_prefixes: dict[int, str] | None = None,
-    extra_iec_prefixes: dict[int, str] | None = None,
     extra_parts_per_forms: dict[int, str] | None = None,
     capitalize: bool | None = None,
     superscript: bool | None = None,
@@ -69,7 +68,6 @@ def set_global_options(  # noqa: PLR0913
         left_pad_dec_place=left_pad_dec_place,
         exp_format=exp_format,
         extra_si_prefixes=extra_si_prefixes,
-        extra_iec_prefixes=extra_iec_prefixes,
         extra_parts_per_forms=extra_parts_per_forms,
         capitalize=capitalize,
         superscript=superscript,
@@ -119,7 +117,6 @@ class GlobalOptionsContext:
         left_pad_dec_place: int | None = None,
         exp_format: option_types.ExpFormat | None = None,
         extra_si_prefixes: dict[int, str] | None = None,
-        extra_iec_prefixes: dict[int, str] | None = None,
         extra_parts_per_forms: dict[int, str] | None = None,
         capitalize: bool | None = None,
         superscript: bool | None = None,
@@ -145,7 +142,6 @@ class GlobalOptionsContext:
             left_pad_dec_place=left_pad_dec_place,
             exp_format=exp_format,
             extra_si_prefixes=extra_si_prefixes,
-            extra_iec_prefixes=extra_iec_prefixes,
             extra_parts_per_forms=extra_parts_per_forms,
             capitalize=capitalize,
             superscript=superscript,

sciform/format_utils/exp_translations.py

@@ -24,18 +24,6 @@ val_to_si_dict = {
     -30: "q",
 }
 
-val_to_iec_dict = {
-    0: "",
-    10: "Ki",
-    20: "Mi",
-    30: "Gi",
-    40: "Ti",
-    50: "Pi",
-    60: "Ei",
-    70: "Zi",
-    80: "Yi",
-}
-
 val_to_parts_per_dict = {
     0: "",
     -6: "ppm",

sciform/format_utils/exponents.py

@@ -2,15 +2,14 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Literal, cast
+from typing import TYPE_CHECKING
 
 from sciform.format_utils.exp_translations import (
-    val_to_iec_dict,
     val_to_parts_per_dict,
     val_to_si_dict,
 )
 from sciform.format_utils.numbers import (
-    get_mantissa_exp_base,
+    get_mantissa_exp,
 )
 from sciform.options.option_types import (
     ExpFormatEnum,
@@ -24,22 +23,13 @@ if TYPE_CHECKING:  # pragma: no cover
 
 def get_translation_dict(
     exp_format: ExpFormatEnum,
-    base: Literal[10, 2],
     extra_si_prefixes: dict[int, str],
-    extra_iec_prefixes: dict[int, str],
     extra_parts_per_forms: dict[int, str],
 ) -> dict[int, str]:
     """Resolve dictionary of prefix translations."""
     if exp_format is ExpFormatEnum.PREFIX:
-        if base == 10:
-            translation_dict = val_to_si_dict.copy()
-            translation_dict.update(extra_si_prefixes)
-        elif base == 2:
-            translation_dict = val_to_iec_dict.copy()
-            translation_dict.update(extra_iec_prefixes)
-        else:
-            msg = f"Unhandled base {base}"
-            raise ValueError(msg)
+        translation_dict = val_to_si_dict.copy()
+        translation_dict.update(extra_si_prefixes)
     elif exp_format is ExpFormatEnum.PARTS_PER:
         translation_dict = val_to_parts_per_dict.copy()
         translation_dict.update(extra_parts_per_forms)
@@ -50,24 +40,21 @@ def get_translation_dict(
     return translation_dict
 
 
-base_exp_symbol_dict = {10: "e", 2: "b"}
-
-
-def get_standard_exp_str(base: int, exp_val: int, *, capitalize: bool = False) -> str:
+def get_standard_exp_str(exp_val: int, *, capitalize: bool = False) -> str:
     """Get standard (eg. 'e+02') exponent string."""
-    exp_symbol = base_exp_symbol_dict[base]
+    base_symbol = "e"
     if capitalize:
-        exp_symbol = exp_symbol.capitalize()
-    return f"{exp_symbol}{exp_val:+03d}"
+        base_symbol = base_symbol.capitalize()
+    return f"{base_symbol}{exp_val:+03d}"
 
 
 superscript_translate = str.maketrans("+-0123456789", "⁺⁻⁰¹²³⁴⁵⁶⁷⁸⁹")
 
 
-def get_superscript_exp_str(base: int, exp_val: int) -> str:
+def get_superscript_exp_str(exp_val: int) -> str:
     """Get superscript (e.g. '×10⁺²') exponent string."""
     exp_val_str = f"{exp_val}".translate(superscript_translate)
-    return f"×{base}{exp_val_str}"
+    return f"×10{exp_val_str}"
 
 
 def get_exp_str(  # noqa: PLR0913
@@ -76,7 +63,6 @@ def get_exp_str(  # noqa: PLR0913
     exp_mode: ExpModeEnum,
     exp_format: ExpFormatEnum,
     extra_si_prefixes: dict[int, str],
-    extra_iec_prefixes: dict[int, str],
     extra_parts_per_forms: dict[int, str],
     capitalize: bool,
     superscript: bool,
@@ -87,18 +73,10 @@ def get_exp_str(  # noqa: PLR0913
     if exp_mode is ExpModeEnum.PERCENT:
         return "%"
 
-    if exp_mode is ExpModeEnum.BINARY or exp_mode is ExpModeEnum.BINARY_IEC:
-        base = 2
-    else:
-        base = 10
-    base = cast(Literal[10, 2], base)
-
     if exp_format is ExpFormatEnum.PREFIX or exp_format is ExpFormatEnum.PARTS_PER:
         translation_dict = get_translation_dict(
             exp_format,
-            base,
             extra_si_prefixes,
-            extra_iec_prefixes,
             extra_parts_per_forms,
         )
         if (
@@ -110,9 +88,9 @@ def get_exp_str(  # noqa: PLR0913
             return exp_str
 
     if superscript:
-        return get_superscript_exp_str(base, exp_val)
+        return get_superscript_exp_str(exp_val)
 
-    return get_standard_exp_str(base, exp_val, capitalize=capitalize)
+    return get_standard_exp_str(exp_val, capitalize=capitalize)
 
 
 def get_val_unc_exp(
@@ -132,7 +110,7 @@ def get_val_unc_exp(
     else:
         exp_driver_val = unc
 
-    _, exp_val, _ = get_mantissa_exp_base(
+    _, exp_val = get_mantissa_exp(
         exp_driver_val,
         exp_mode=exp_mode,
         input_exp=input_exp,

sciform/format_utils/numbers.py

@@ -1,10 +1,9 @@
-"""Utilities for parsing mantissa, base, and exp."""
+"""Utilities for parsing mantissa, and exp."""
 
 from __future__ import annotations
 
 import re
 from decimal import Decimal
-from math import floor, log2
 from typing import Literal
 
 from sciform.formatting.parser import (
@@ -26,13 +25,6 @@ def get_top_dec_place(num: Decimal) -> int:
     return len(digits) + exp - 1
 
 
-def get_top_dec_place_binary(num: Decimal) -> int:
-    """Get the decimal place of a decimal's most significant digit."""
-    if not num.is_finite() or num == 0:
-        return 0
-    return floor(log2(abs(num)))
-
-
 def get_bottom_dec_place(num: Decimal) -> int:
     """Get the decimal place of a decimal's least significant digit."""
     if not num.is_finite():
@@ -102,39 +94,12 @@ def get_engineering_exp(
     return exp_val
 
 
-def get_binary_exp(
-    num: Decimal,
-    input_exp: int | ExpValEnum,
-    *,
-    iec: bool = False,
-) -> int:
-    """Get the exponent for binary formatting modes."""
-    if input_exp is ExpValEnum.AUTO:
-        exp_val = get_top_dec_place_binary(num)
-        if iec:
-            exp_val = (exp_val // 10) * 10
-    else:
-        if iec and input_exp % 10 != 0:
-            msg = (
-                f"Exponent must be an integer multiple of 10 in binary IEC mode, not "
-                f"{input_exp}."
-            )
-            raise ValueError(msg)
-        exp_val = input_exp
-    return exp_val
-
-
-def get_mantissa_exp_base(
+def get_mantissa_exp(
     num: Decimal,
     exp_mode: ExpModeEnum,
     input_exp: int | ExpValEnum,
-) -> tuple[Decimal, int, int]:
-    """Get mantissa, exponent, and base for formatting a decimal number."""
-    if exp_mode is ExpModeEnum.BINARY or exp_mode is ExpModeEnum.BINARY_IEC:
-        base = 2
-    else:
-        base = 10
-
+) -> tuple[Decimal, int]:
+    """Get mantissa and exponent for formatting a decimal number."""
     if num == 0 or not num.is_finite():
         mantissa = Decimal(num)
         exp = 0 if input_exp is ExpValEnum.AUTO else input_exp
@@ -147,16 +112,12 @@ def get_mantissa_exp_base(
             exp = get_engineering_exp(num, input_exp)
         elif exp_mode is ExpModeEnum.ENGINEERING_SHIFTED:
             exp = get_engineering_exp(num, input_exp, shifted=True)
-        elif exp_mode is ExpModeEnum.BINARY:
-            exp = get_binary_exp(num, input_exp)
-        elif exp_mode is ExpModeEnum.BINARY_IEC:
-            exp = get_binary_exp(num, input_exp, iec=True)
         else:
             msg = f"Unhandled exponent mode {exp_mode}."
             raise ValueError(msg)
-        mantissa = num * Decimal(base) ** Decimal(-exp)
+        mantissa = num * Decimal(10) ** Decimal(-exp)
     mantissa = mantissa.normalize()
-    return mantissa, exp, base
+    return mantissa, exp
 
 
 # language=pythonverboseregexp  noqa: ERA001

sciform/formatting/fsml.py

@@ -18,7 +18,7 @@ pattern = re.compile(
                            |
                            (?P<round_mode_special>[AP])
                          )?
-                         (?P<exp_mode>[fF%eErRbB])?
+                         (?P<exp_mode>[fF%eErR])?
                          (?:x(?P<exp_val>[+-]?\d+))?
                          (?P<prefix_mode>p)?
                          (?P<paren_uncertainty>\(\))?
@@ -46,11 +46,6 @@ def parse_exp_mode(
                 exp_mode = "engineering_shifted"
             else:
                 exp_mode = "engineering"
-        elif exp_mode in ["b", "B"]:
-            if alternate_mode:
-                exp_mode = "binary_iec"
-            else:
-                exp_mode = "binary"
     else:
         capitalize = None
     return exp_mode, capitalize

sciform/formatting/number_formatting.py

@@ -16,7 +16,7 @@ from sciform.format_utils.make_strings import (
     get_sign_str,
 )
 from sciform.format_utils.numbers import (
-    get_mantissa_exp_base,
+    get_mantissa_exp,
     get_val_unc_top_dec_place,
     parse_mantissa_from_ascii_exp_str,
 )
@@ -88,7 +88,6 @@ def format_non_finite(num: Decimal, options: FinalizedOptions) -> str:
             capitalize=options.capitalize,
             superscript=options.superscript,
             extra_si_prefixes=options.extra_si_prefixes,
-            extra_iec_prefixes=options.extra_iec_prefixes,
             extra_parts_per_forms=options.extra_parts_per_forms,
         )
     else:
@@ -120,7 +119,7 @@ def format_num(num: Decimal, options: FinalizedOptions) -> str:
     round_mode = options.round_mode
     exp_mode = options.exp_mode
     ndigits = options.ndigits
-    mantissa, temp_exp_val, base = get_mantissa_exp_base(num, exp_mode, exp_val)
+    mantissa, temp_exp_val = get_mantissa_exp(num, exp_mode, exp_val)
     round_digit = get_round_dec_place(mantissa, round_mode, ndigits)
     mantissa_rounded = round(mantissa, -round_digit)
 
@@ -128,8 +127,8 @@ def format_num(num: Decimal, options: FinalizedOptions) -> str:
     Repeat mantissa + exponent discovery after rounding in case rounding
     altered the required exponent.
     """
-    rounded_num = mantissa_rounded * Decimal(base) ** Decimal(temp_exp_val)
-    mantissa, exp_val, base = get_mantissa_exp_base(rounded_num, exp_mode, exp_val)
+    rounded_num = mantissa_rounded * Decimal(10) ** Decimal(temp_exp_val)
+    mantissa, exp_val = get_mantissa_exp(rounded_num, exp_mode, exp_val)
     round_digit = get_round_dec_place(mantissa, round_mode, ndigits)
     mantissa_rounded = round(mantissa, -int(round_digit))
     mantissa_rounded = cast(Decimal, mantissa_rounded)
@@ -170,7 +169,6 @@ def format_num(num: Decimal, options: FinalizedOptions) -> str:
         capitalize=options.capitalize,
         superscript=options.superscript,
         extra_si_prefixes=options.extra_si_prefixes,
-        extra_iec_prefixes=options.extra_iec_prefixes,
         extra_parts_per_forms=options.extra_parts_per_forms,
     )
 
@@ -179,16 +177,10 @@ def format_num(num: Decimal, options: FinalizedOptions) -> str:
     return result
 
 
-def format_val_unc(val: Decimal, unc: Decimal, options: FinalizedOptions) -> str:  # noqa: PLR0915
+def format_val_unc(val: Decimal, unc: Decimal, options: FinalizedOptions) -> str:
     """Format value/uncertainty pair according to input options."""
     exp_mode = options.exp_mode
 
-    if exp_mode is ExpModeEnum.BINARY or exp_mode is ExpModeEnum.BINARY_IEC:
-        msg = (
-            "Binary exponent modes are not supported for value/uncertainty formatting."
-        )
-        raise NotImplementedError(msg)
-
     unc = abs(unc)
     if exp_mode is ExpModeEnum.PERCENT:
         val *= 100
@@ -269,12 +261,12 @@ def format_val_unc(val: Decimal, unc: Decimal, options: FinalizedOptions) -> str
         """
         ndigits = -round_digit + exp_val
 
-    val_mantissa, _, _ = get_mantissa_exp_base(
+    val_mantissa, _ = get_mantissa_exp(
         val_rounded,
         exp_mode=exp_mode,
         input_exp=exp_val,
     )
-    unc_mantissa, _, _ = get_mantissa_exp_base(
+    unc_mantissa, _ = get_mantissa_exp(
         unc_rounded,
         exp_mode=exp_mode,
         input_exp=exp_val,
@@ -337,7 +329,6 @@ def format_val_unc(val: Decimal, unc: Decimal, options: FinalizedOptions) -> str
             exp_mode=exp_mode,
             exp_format=options.exp_format,
             extra_si_prefixes=options.extra_si_prefixes,
-            extra_iec_prefixes=options.extra_iec_prefixes,
             extra_parts_per_forms=options.extra_parts_per_forms,
             capitalize=options.capitalize,
             superscript=options.superscript,

sciform/formatting/output_conversion.py

@@ -6,12 +6,11 @@ import re
 from typing import Literal, get_args
 
 ascii_exp_pattern = re.compile(
-    r"^(?P<mantissa>.*)(?P<ascii_base>[eEbB])(?P<exp>[+-]\d+)$",
+    r"^(?P<mantissa>.*)(?P<ascii_base>[eE])(?P<exp>[+-]\d+)$",
 )
-ascii_base_dict = {"e": 10, "E": 10, "b": 2, "B": 2}
 
 unicode_exp_pattern = re.compile(
-    r"^(?P<mantissa>.*)×(?P<base>10|2)(?P<super_exp>[⁺⁻]?[⁰¹²³⁴⁵⁶⁷⁸⁹]+)$",
+    r"^(?P<mantissa>.*)×10(?P<super_exp>[⁺⁻]?[⁰¹²³⁴⁵⁶⁷⁸⁹]+)$",
 )
 superscript_translation = str.maketrans("⁺⁻⁰¹²³⁴⁵⁶⁷⁸⁹", "+-0123456789")
 
@@ -19,24 +18,17 @@ output_formats = Literal["latex", "html", "ascii"]
 
 
 def _make_exp_str(
-    base: int,
     exp: int,
     output_format: output_formats,
     *,
     capitalize: bool = False,
 ) -> str:
     if output_format == "latex":
-        return rf"\times{base}^{{{exp}}}"
+        return rf"\times10^{{{exp}}}"
     if output_format == "html":
-        return f"×{base}<sup>{exp}</sup>"
+        return f"×10<sup>{exp}</sup>"
     if output_format == "ascii":
-        if base == 10:
-            exp_str = f"e{exp:+03d}"
-        elif base == 2:
-            exp_str = f"b{exp:+03d}"
-        else:
-            msg = f"base must be 10 or 2, not {base}"
-            raise ValueError(msg)
+        exp_str = f"e{exp:+03d}"
         if capitalize:
             exp_str = exp_str.upper()
         return exp_str
@@ -116,10 +108,8 @@ def convert_sciform_format(
     if match := re.match(ascii_exp_pattern, formatted_str):
         mantissa = match.group("mantissa")
         ascii_base = match.group("ascii_base")
-        base = ascii_base_dict[ascii_base]
         exp = int(match.group("exp"))
         exp_str = _make_exp_str(
-            base,
             exp,
             output_format,
             capitalize=ascii_base.isupper(),
@@ -128,10 +118,9 @@ def convert_sciform_format(
         suffix_str = exp_str
     elif match := re.match(unicode_exp_pattern, formatted_str):
         mantissa = match.group("mantissa")
-        base = int(match.group("base"))
         super_exp = match.group("super_exp")
         exp = int(super_exp.translate(superscript_translation))
-        exp_str = _make_exp_str(base, exp, output_format)
+        exp_str = _make_exp_str(exp, output_format)
         main_str = mantissa
         suffix_str = exp_str
     else:

sciform/formatting/parser.py

@@ -51,9 +51,9 @@ paren_pattern = rf"""
 """
 
 # language=pythonverboseregexp
-ascii_exp_pattern = r"(?P<ascii_exp>(?P<ascii_base>[eEbB])(?P<ascii_exp_val>[+-]\d+))"
+ascii_exp_pattern = r"(?P<ascii_exp>(?P<ascii_base>[eE])(?P<ascii_exp_val>[+-]\d+))"
 # language=pythonverboseregexp
-uni_exp_pattern = r"(?P<uni_exp>×(?P<uni_base>10|2)(?P<uni_exp_val>[⁺⁻]?[⁰¹²³⁴⁵⁶⁷⁸⁹]+))"
+uni_exp_pattern = r"(?P<uni_exp>×10(?P<uni_exp_val>[⁺⁻]?[⁰¹²³⁴⁵⁶⁷⁸⁹]+))"
 # language=pythonverboseregexp
 prefix_exp_pattern = r"(\ (?P<prefix_exp>[a-zA-zμ]+))"
 # language=pythonverboseregexp
@@ -88,79 +88,58 @@ $
 superscript_translation = str.maketrans("⁺⁻⁰¹²³⁴⁵⁶⁷⁸⁹", "+-0123456789")
 
 
-def _get_ascii_base_exp_val(match: re.Match) -> tuple[int, int]:
-    base = match.group("ascii_base")
-    if base.lower() == "e":
-        base = 10
-    elif base.lower() == "b":
-        base = 2
-    else:  # pragma: no cover
-        msg = f'Unexpected ASCII base: "{base}"'
-        raise ValueError(msg)
-    exp_val = int(match.group("ascii_exp_val"))
-    return base, exp_val
+def _get_ascii_exp_val(match: re.Match) -> int:
+    return int(match.group("ascii_exp_val"))
 
 
-def _get_unicode_base_exp_val(match: re.Match) -> tuple[int, int]:
-    base = int(match.group("uni_base"))
-    exp_val = int(match.group("uni_exp_val").translate(superscript_translation))
-    return base, exp_val
+def _get_unicode_exp_val(match: re.Match) -> int:
+    return int(match.group("uni_exp_val").translate(superscript_translation))
 
 
-def _get_prefix_base_exp_val(prefix_exp: str) -> tuple[int, int]:
-    candidate_base_exp_val_pairs = []
+def _get_prefix_exp_val(prefix_exp: str) -> int:
+    candidate_exp_vals = []
     global_options = global_options_module.GLOBAL_DEFAULT_OPTIONS
 
     si_translations = exp_translations.val_to_si_dict.copy()
     si_translations.update(global_options.extra_si_prefixes)
     for key, value in si_translations.items():
         if prefix_exp == value:
-            candidate_base_exp_val_pairs.append((10, key))
+            candidate_exp_vals.append(key)
 
     pp_translations = exp_translations.val_to_parts_per_dict.copy()
     pp_translations.update(global_options.extra_parts_per_forms)
     for key, value in pp_translations.items():
         if prefix_exp == value:
-            candidate_base_exp_val_pairs.append((10, key))
-
-    iec_translations = exp_translations.val_to_iec_dict.copy()
-    iec_translations.update(global_options.extra_iec_prefixes)
-    for key, value in iec_translations.items():
-        if prefix_exp == value:
-            candidate_base_exp_val_pairs.append((2, key))
+            candidate_exp_vals.append(key)
 
-    if len(candidate_base_exp_val_pairs) == 0:
+    if len(candidate_exp_vals) == 0:
         msg = f'Unrecognized prefix: "{prefix_exp}". Unable to parse input.'
         raise ValueError(msg)
-    if len(set(candidate_base_exp_val_pairs)) > 1:
-        candidate_exps = [
-            candidate_pair[1] for candidate_pair in candidate_base_exp_val_pairs
-        ]
+    if len(set(candidate_exp_vals)) > 1:
         msg = (
-            f'Multiple translations found for "{prefix_exp}": {candidate_exps}. '
+            f'Multiple translations found for "{prefix_exp}": {candidate_exp_vals}. '
             f"Unable to parse input."
         )
         raise ValueError(msg)
-    base, exp_val = candidate_base_exp_val_pairs[0]
-    return base, exp_val
+    exp_val = candidate_exp_vals[0]
+    return exp_val
 
 
-def _extract_exp_base_exp_val(
+def _extract_exp_val(
     match: re.Match,
 ) -> tuple[int, int]:
     if match.group("ascii_exp"):
-        base, exp_val = _get_ascii_base_exp_val(match)
+        exp_val = _get_ascii_exp_val(match)
     elif match.group("uni_exp"):
-        base, exp_val = _get_unicode_base_exp_val(match)
+        exp_val = _get_unicode_exp_val(match)
     elif prefix_exp := match.group("prefix_exp"):
-        base, exp_val = _get_prefix_base_exp_val(prefix_exp)
+        exp_val = _get_prefix_exp_val(prefix_exp)
     elif match.group("percent_exp"):
-        base = 10
         exp_val = -2
     else:  # pragma: no cover
         msg = "Expected named match groups not found."
         raise ValueError(msg)
-    return base, exp_val
+    return exp_val
 
 
 def _infer_decimal_separator(
@@ -252,54 +231,52 @@ def _normalize_separators(
     return input_str
 
 
-def _parse_no_exp_pattern(match: re.Match) -> tuple[str, str | None, int, int]:
+def _parse_no_exp_pattern(match: re.Match) -> tuple[str, str | None, int]:
     if val := match.group("non_finite_val"):
         unc = None
     else:
         val = match.group("pm_val")
         unc = match.group("pm_unc")
-    base = 10
     exp_val = 0
-    return val, unc, base, exp_val
+    return val, unc, exp_val
 
 
-def _parse_optional_exp_pattern(match: re.Match) -> tuple[str, str | None, int, int]:
+def _parse_optional_exp_pattern(match: re.Match) -> tuple[str, str | None, int]:
     if match.group("exp"):
-        base, exp_val = _extract_exp_base_exp_val(match)
+        exp_val = _extract_exp_val(match)
     else:
-        base = 10
         exp_val = 0
     if val := match.group("val"):
         unc = None
     else:
         val = match.group("paren_val")
         unc = match.group("paren_unc")
-    return val, unc, base, exp_val
+    return val, unc, exp_val
 
 
-def _parse_always_exp_pattern(match: re.Match) -> tuple[str, str | None, int, int]:
-    base, exp_val = _extract_exp_base_exp_val(match)
+def _parse_always_exp_pattern(match: re.Match) -> tuple[str, str | None, int]:
+    exp_val = _extract_exp_val(match)
     if val := match.group("non_finite_val"):
         unc = None
     else:
         val = match.group("pm_val")
         unc = match.group("pm_unc")
-    return val, unc, base, exp_val
+    return val, unc, exp_val
 
 
-def _extract_val_unc_base_exp(
+def _extract_val_unc_exp(
     input_str: str,
-) -> tuple[str, str | None, int, int]:
+) -> tuple[str, str | None, int]:
     if match := re.fullmatch(no_exp_pattern, input_str, re.VERBOSE):
-        val, unc, base, exp_val = _parse_no_exp_pattern(match)
+        val, unc, exp_val = _parse_no_exp_pattern(match)
     elif match := re.fullmatch(optional_exp_pattern, input_str, re.VERBOSE):
-        val, unc, base, exp_val = _parse_optional_exp_pattern(match)
+        val, unc, exp_val = _parse_optional_exp_pattern(match)
     elif match := re.fullmatch(always_exp_pattern, input_str, re.VERBOSE):
-        val, unc, base, exp_val = _parse_always_exp_pattern(match)
+        val, unc, exp_val = _parse_always_exp_pattern(match)
     else:
         msg = f'Input string "{input_str}" does not match any expected input format.'
         raise ValueError(msg)
-    return val, unc, base, exp_val
+    return val, unc, exp_val
 
 
 def parse_val_unc_from_str(
@@ -319,8 +296,8 @@ def parse_val_unc_from_str(
         (INF)e+00, or "(123.000 ± 0.456)e+01"
 
     Whichever pattern is matched is then parsed to extract the value,
-    uncertainty, and exponent base and value (if no exponent information
-    is available then base is set to 10 and value is set to 0).
+    uncertainty, and exponent value (if no exponent information
+    is available then the exponent value is set to 0).
 
     Next, grouping separators such as "_" or " " are stripped from the
     value and uncertainty strings. An algorithm is then run to detect
@@ -339,7 +316,7 @@ def parse_val_unc_from_str(
     Finally, the value and uncertainty strings are converted to decimals
     and multiplied by the extracted exponents.
     """
-    val, unc, base, exp_val = _extract_val_unc_base_exp(input_str)
+    val, unc, exp_val = _extract_val_unc_exp(input_str)
 
     decimal_separator = _parse_decimal_separator(val, unc, decimal_separator)
 
@@ -372,16 +349,15 @@ def parse_val_unc_from_str(
             raise ValueError(msg)
         unc = "0." + "0" * num_missing_zeros + unc
 
-    base = Decimal(base)
     exp_val = Decimal(exp_val)
     val = Decimal(val)
     if val.is_finite():
-        val *= base**exp_val
+        val *= 10**exp_val
 
     if unc is not None:
         unc = Decimal(unc)
         if unc.is_finite():
-            unc *= base**exp_val
+            unc *= 10**exp_val
 
     return val, unc
 

sciform/options/finalized_options.py

@@ -30,7 +30,6 @@ class FinalizedOptions:
     left_pad_dec_place: int
     exp_format: option_types.ExpFormatEnum
     extra_si_prefixes: dict[int, str]
-    extra_iec_prefixes: dict[int, str]
     extra_parts_per_forms: dict[int, str]
     capitalize: bool
     superscript: bool

sciform/options/global_options.py

@@ -15,7 +15,6 @@ PKG_DEFAULT_OPTIONS = PopulatedOptions(
     left_pad_dec_place=0,
     exp_format="standard",
     extra_si_prefixes={},
-    extra_iec_prefixes={},
     extra_parts_per_forms={},
     capitalize=False,
     superscript=False,

sciform/options/input_options.py

@@ -62,7 +62,6 @@ class InputOptions:
     left_pad_dec_place: int | None = None
     exp_format: option_types.ExpFormat | None = None
     extra_si_prefixes: dict[int, str] | None = None
-    extra_iec_prefixes: dict[int, str] | None = None
     extra_parts_per_forms: dict[int, str] | None = None
     capitalize: bool | None = None
     superscript: bool | None = None

sciform/options/option_types.py

@@ -74,8 +74,6 @@ ExpMode = Literal[
     "scientific",
     "engineering",
     "engineering_shifted",
-    "binary",
-    "binary_iec",
 ]
 
 
@@ -87,8 +85,6 @@ class ExpModeEnum(str, Enum):
     SCIENTIFIC = "scientific"
     ENGINEERING = "engineering"
     ENGINEERING_SHIFTED = "engineering_shifted"
-    BINARY = "binary"
-    BINARY_IEC = "binary_iec"
 
 
 ExpFormat = Literal["standard", "prefix", "parts_per"]

sciform/options/populated_options.py

@@ -55,7 +55,6 @@ class PopulatedOptions:
      'left_pad_dec_place': 0,
      'exp_format': 'standard',
      'extra_si_prefixes': {},
-     'extra_iec_prefixes': {},
      'extra_parts_per_forms': {},
      'capitalize': False,
      'superscript': True,
@@ -66,7 +65,7 @@ class PopulatedOptions:
      'pm_whitespace': True,
     )
     >>> print(formatter.populated_options.as_dict())
-    {'exp_mode': 'engineering', 'exp_val': 'auto', 'round_mode': 'sig_fig', 'ndigits': 2, 'upper_separator': '', 'decimal_separator': '.', 'lower_separator': '', 'sign_mode': '-', 'left_pad_char': ' ', 'left_pad_dec_place': 0, 'exp_format': 'standard', 'extra_si_prefixes': {}, 'extra_iec_prefixes': {}, 'extra_parts_per_forms': {}, 'capitalize': False, 'superscript': True, 'nan_inf_exp': False, 'paren_uncertainty': False, 'left_pad_matching': False, 'paren_uncertainty_trim': True, 'pm_whitespace': True}
+    {'exp_mode': 'engineering', 'exp_val': 'auto', 'round_mode': 'sig_fig', 'ndigits': 2, 'upper_separator': '', 'decimal_separator': '.', 'lower_separator': '', 'sign_mode': '-', 'left_pad_char': ' ', 'left_pad_dec_place': 0, 'exp_format': 'standard', 'extra_si_prefixes': {}, 'extra_parts_per_forms': {}, 'capitalize': False, 'superscript': True, 'nan_inf_exp': False, 'paren_uncertainty': False, 'left_pad_matching': False, 'paren_uncertainty_trim': True, 'pm_whitespace': True}
 
     Note that :class:`PopulatedOptions` lacks the ``add_c_prefix``,
     ``add_small_si_prefixes`` and ``add_ppth_form`` options present
@@ -103,7 +102,6 @@ class PopulatedOptions:
     left_pad_dec_place: int
     exp_format: option_types.ExpFormat
     extra_si_prefixes: dict[int, str]
-    extra_iec_prefixes: dict[int, str]
     extra_parts_per_forms: dict[int, str]
     capitalize: bool
     superscript: bool

sciform/options/validation.py

@@ -89,12 +89,6 @@ def validate_exp_val(
                     f"for engineering exponent modes."
                 )
                 raise ValueError(msg)
-            if options.exp_mode == "binary_iec" and options.exp_val % 10 != 0:
-                msg = (
-                    f"Exponent must be a multiple of 10, not "
-                    f"exp_val={options.exp_val}, for binary IEC exponent mode."
-                )
-                raise ValueError(msg)
 
 
 def validate_exp_options(
@@ -188,7 +182,6 @@ def validate_extra_translations(
     """Validate translation dictionary have int keys and alphabetic values."""
     translations_dicts = [
         options.extra_si_prefixes,
-        options.extra_iec_prefixes,
         options.extra_parts_per_forms,
     ]
 

{sciform-0.38.2.dist-info → sciform-0.39.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sciform
-Version: 0.38.2
+Version: 0.39.0
 Summary: A package for formatting numbers into scientific formatted strings.
 Author-email: Justin Gerber <justin.gerber48@gmail.com>
 Project-URL: homepage, https://github.com/jagerber48/sciform
@@ -90,10 +90,9 @@ Overview
 
 ``sciform`` is used to convert python numbers into strings according to
 a variety of user-selected scientific formatting options including
-decimal, binary, fixed-point, scientific and engineering formats.
+fixed-point, scientific and engineering formats.
 Where possible, formatting follows documented standards such as those
-published by `BIPM <https://www.bipm.org/en/>`_ or
-`IEC <https://iec.ch/homepage>`_.
+published by `BIPM <https://www.bipm.org/en/>`_.
 ``sciform`` provides certain options, such as engineering notation,
 well-controlled significant figure rounding, and separator customization
 which are not provided by the python built-in

sciform-0.39.0.dist-info/RECORD

@@ -0,0 +1,31 @@
+sciform/__init__.py,sha256=Lnb1fep9vjJ7n4U5YdNqRkq9saXuRvppedpW1TZm99Y,781
+sciform/api/__init__.py,sha256=kWXKOuVgwn3580EBGGs4t2uK7_uBgjfvQq2r8b9ZPrM,24
+sciform/api/formatted_number.py,sha256=VdQGRXmUy_Pwc2SeYT8KlZMJBJDu0maI0HHv9DXu1fQ,2804
+sciform/api/formatter.py,sha256=-Cgfbk8M9DGoP0Da8PAzjJVnNqya8NBd-A9osHL0Ov8,14962
+sciform/api/global_configuration.py,sha256=f6N5GqbvBvNL1mHm4uTnyoom28dwoxtfEys1f1YpPmc,6656
+sciform/api/scinum.py,sha256=XF4QiBAlehEKnk_NwDDVWmLnRDwfEalmuzC8b2qUE4Q,3363
+sciform/format_utils/__init__.py,sha256=9tCbjsOOiqvw0DoMUo9qcIC8pFykfVZZ8wkEIRAh-OE,132
+sciform/format_utils/exp_translations.py,sha256=e7yJkWsbTJfF_k8kfvctZ2llZRrn908biyZ1ulu1M4w,429
+sciform/format_utils/exponents.py,sha256=Wq6m6N9qZcyf1hAeWhKraHOJTtd8NiYiB9niNI4DiXI,3254
+sciform/format_utils/grouping.py,sha256=1hZjjVKRUy477LGGFniZwwEHHBDaSb6E0K3SAeCACVY,1641
+sciform/format_utils/make_strings.py,sha256=4g1E3UBDLeoF272OpIGCiuzeZ4KsDjWNiXvbMIfr3sg,5258
+sciform/format_utils/numbers.py,sha256=Se3F9qTooRrtBw_b9n-Nx4Nd1tkV-44glO1KZ9kCjVg,4603
+sciform/format_utils/rounding.py,sha256=VkvIg_UNpGfBG8QQQVGLZPwNfw5Tj3jlM8Wgx1r6ils,3491
+sciform/formatting/__init__.py,sha256=T_DnF4vkeAQx1xuzff7rRZbWj-hEbNI6Pj2D2831L9E,38
+sciform/formatting/fsml.py,sha256=-dLnJ0ZfmQw4XdeAi1EF9brgiGsFLOIJmBWCzr9bTEc,3679
+sciform/formatting/number_formatting.py,sha256=rOwBCsr2_ccmGiU9JpPs2aNwlw82GJf-iOlZqOfQoxg,11802
+sciform/formatting/output_conversion.py,sha256=kwYJsj33RE1BVPMfK28wYni6KhcMhfHNap78cQfE-qo,5136
+sciform/formatting/parser.py,sha256=j9rdxXrV_6gMD0_AdvdS4PJ5aGMAxyJ9yRSr2_WvDLM,15190
+sciform/options/__init__.py,sha256=tw_CZHaNrdixZoQyG6ZD5UMKkQxXok0qBQCxt28Gh20,51
+sciform/options/conversion.py,sha256=2ad0Mwwb7qqJ5xClevxaUVkVznokQBmAVVewh_5-7jU,4146
+sciform/options/finalized_options.py,sha256=6LNX38NBsiZkZD4zZtmIMJ7LteP8-bmQGBweDNfWPyI,1223
+sciform/options/global_options.py,sha256=3uJT47dg2cmiCc-DSeQi-9ES39RagZcN1lrp6eXg_6A,670
+sciform/options/input_options.py,sha256=0PIc4JINvY2XRPpv9s4zhclPsII3MTT77j4Kf1tWb1k,3753
+sciform/options/option_types.py,sha256=nEzkj3QHRSGEYr6R2hCOKtRcHIwhHS9BD8QRAX931vM,2262
+sciform/options/populated_options.py,sha256=0n0vWH8ixNxwWGxAJdGzi46--noDfiOrOJpx4Hu6iaw,4865
+sciform/options/validation.py,sha256=8Zg5dcp-sPqyZWo5zMZVMzAmFS5KlA8kTjdMGBG9VmU,7754
+sciform-0.39.0.dist-info/LICENSE,sha256=-oyCEZu-6HLrRSfRg44uuNDE0c59GVEdqYIgidqSP70,1056
+sciform-0.39.0.dist-info/METADATA,sha256=S6iVxqbYucDB_mI4XKUSBiykbRbzZMGltkKkP4tnLUM,8937
+sciform-0.39.0.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+sciform-0.39.0.dist-info/top_level.txt,sha256=mC01YOQ-1u5pDk9BJia-pQKLUMvkreMsldDpFcp7NV8,8
+sciform-0.39.0.dist-info/RECORD,,

{sciform-0.38.2.dist-info → sciform-0.39.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

sciform-0.38.2.dist-info/RECORD

@@ -1,31 +0,0 @@
-sciform/__init__.py,sha256=Lnb1fep9vjJ7n4U5YdNqRkq9saXuRvppedpW1TZm99Y,781
-sciform/api/__init__.py,sha256=kWXKOuVgwn3580EBGGs4t2uK7_uBgjfvQq2r8b9ZPrM,24
-sciform/api/formatted_number.py,sha256=VdQGRXmUy_Pwc2SeYT8KlZMJBJDu0maI0HHv9DXu1fQ,2804
-sciform/api/formatter.py,sha256=0eOLQmrNnhDO05rbMMOhPjYUYYkW5fT-SiUAxGKXWEI,15554
-sciform/api/global_configuration.py,sha256=iSmGcnfs-2cvWz27t9ka9ibDuN732sLwDsLJTi8SA-g,6866
-sciform/api/scinum.py,sha256=XF4QiBAlehEKnk_NwDDVWmLnRDwfEalmuzC8b2qUE4Q,3363
-sciform/format_utils/__init__.py,sha256=9tCbjsOOiqvw0DoMUo9qcIC8pFykfVZZ8wkEIRAh-OE,132
-sciform/format_utils/exp_translations.py,sha256=uh9ZxDKcGcMVSNwj7qkr5TSA6MINIaU1RHZeqKVwEQ0,575
-sciform/format_utils/exponents.py,sha256=khG9mkHRG-qb2Xnd_lpkLXwV8KcHUJekgC8MwgfSL_U,3976
-sciform/format_utils/grouping.py,sha256=1hZjjVKRUy477LGGFniZwwEHHBDaSb6E0K3SAeCACVY,1641
-sciform/format_utils/make_strings.py,sha256=4g1E3UBDLeoF272OpIGCiuzeZ4KsDjWNiXvbMIfr3sg,5258
-sciform/format_utils/numbers.py,sha256=L3J8B7GR6RWNaYthDmnY5d4bLYBviCYw-Evqb754VTw,5799
-sciform/format_utils/rounding.py,sha256=VkvIg_UNpGfBG8QQQVGLZPwNfw5Tj3jlM8Wgx1r6ils,3491
-sciform/formatting/__init__.py,sha256=T_DnF4vkeAQx1xuzff7rRZbWj-hEbNI6Pj2D2831L9E,38
-sciform/formatting/fsml.py,sha256=J2Zd7RD4E32hNTP2Vo_2PEvzHBt3aIUerhLT72stovQ,3843
-sciform/formatting/number_formatting.py,sha256=_4SxAzo3VLp6_ThrJfn9yQu3rH_0_27NOftNSPfIMA8,12268
-sciform/formatting/output_conversion.py,sha256=TdcfQa0p7S7iIkqcwVYbxCGwoGu4mPOV3XzjABnaGmA,5523
-sciform/formatting/parser.py,sha256=58noOOyg5m3NKJwGfEEwiUivzm5vGPG3K1_OXIrrVAk,16310
-sciform/options/__init__.py,sha256=tw_CZHaNrdixZoQyG6ZD5UMKkQxXok0qBQCxt28Gh20,51
-sciform/options/conversion.py,sha256=2ad0Mwwb7qqJ5xClevxaUVkVznokQBmAVVewh_5-7jU,4146
-sciform/options/finalized_options.py,sha256=r38T1qp2sLD0mVIOovfax2Q46zb7yjjypr1CpUsqMCA,1262
-sciform/options/global_options.py,sha256=T_OXFKi2qO5PV-LTZt9ClppWYsUmStBgyQqFuoX6idM,697
-sciform/options/input_options.py,sha256=ibUMS9q_hdf9lms90hA6FzbEZpe-KVdZg5K-A1H7j3Q,3806
-sciform/options/option_types.py,sha256=nZa_HZHlRf6ILbKxXbP1lqB3s9WoJRYv0uLQonY5ud8,2346
-sciform/options/populated_options.py,sha256=7TBuSxBvcUopF16NIMQuGoAT6B0vq0HLigO7qrIld1A,4961
-sciform/options/validation.py,sha256=b70AE6AqbNjEsBkVXwYDQRCQnwVbqWWJ7eUxh2jkyqU,8092
-sciform-0.38.2.dist-info/LICENSE,sha256=-oyCEZu-6HLrRSfRg44uuNDE0c59GVEdqYIgidqSP70,1056
-sciform-0.38.2.dist-info/METADATA,sha256=unQrN6dtmkyuGB6Yl2WsKHZyZgO5isUV7ywTEgvWCyY,8990
-sciform-0.38.2.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-sciform-0.38.2.dist-info/top_level.txt,sha256=mC01YOQ-1u5pDk9BJia-pQKLUMvkreMsldDpFcp7NV8,8
-sciform-0.38.2.dist-info/RECORD,,