-
Notifications
You must be signed in to change notification settings - Fork 477
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
1. split into modules: plain (raw, compact, pretty), latex, html, full 2. added format_magnitude to all Formatters 3. format_ methods have an argument related to babel (it must be always there, other architectures lead to multiplication of classes or lot of overhead) 4. some test where changed: - format_babel was using per (as in meter per seconds) for any format - ro was not a valid locale: should be ro_RO Note: there are still a few circular imports that were fixed in caveman way in order to move forward.
- Loading branch information
Showing
13 changed files
with
1,178 additions
and
662 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,289 @@ | ||
from __future__ import annotations | ||
|
||
from typing import Iterable, Optional, Callable, Any | ||
import warnings | ||
from ...compat import Number | ||
import re | ||
from ...babel_names import _babel_lengths, _babel_units | ||
from ...compat import babel_parse | ||
|
||
FORMATTER = Callable[ | ||
[ | ||
Any, | ||
], | ||
str, | ||
] | ||
|
||
|
||
def formatter( | ||
items: Iterable[tuple[str, Number]], | ||
as_ratio: bool = True, | ||
single_denominator: bool = False, | ||
product_fmt: str = " * ", | ||
division_fmt: str = " / ", | ||
power_fmt: str = "{} ** {}", | ||
parentheses_fmt: str = "({0})", | ||
exp_call: FORMATTER = "{:n}".format, | ||
locale: Optional[str] = None, | ||
babel_length: str = "long", | ||
babel_plural_form: str = "one", | ||
sort: bool = True, | ||
) -> str: | ||
"""Format a list of (name, exponent) pairs. | ||
Parameters | ||
---------- | ||
items : list | ||
a list of (name, exponent) pairs. | ||
as_ratio : bool, optional | ||
True to display as ratio, False as negative powers. (Default value = True) | ||
single_denominator : bool, optional | ||
all with terms with negative exponents are | ||
collected together. (Default value = False) | ||
product_fmt : str | ||
the format used for multiplication. (Default value = " * ") | ||
division_fmt : str | ||
the format used for division. (Default value = " / ") | ||
power_fmt : str | ||
the format used for exponentiation. (Default value = "{} ** {}") | ||
parentheses_fmt : str | ||
the format used for parenthesis. (Default value = "({0})") | ||
locale : str | ||
the locale object as defined in babel. (Default value = None) | ||
babel_length : str | ||
the length of the translated unit, as defined in babel cldr. (Default value = "long") | ||
babel_plural_form : str | ||
the plural form, calculated as defined in babel. (Default value = "one") | ||
exp_call : callable | ||
(Default value = lambda x: f"{x:n}") | ||
sort : bool, optional | ||
True to sort the formatted units alphabetically (Default value = True) | ||
Returns | ||
------- | ||
str | ||
the formula as a string. | ||
""" | ||
|
||
if not items: | ||
return "" | ||
|
||
if as_ratio: | ||
fun = lambda x: exp_call(abs(x)) | ||
else: | ||
fun = exp_call | ||
|
||
pos_terms, neg_terms = [], [] | ||
|
||
if sort: | ||
items = sorted(items) | ||
for key, value in items: | ||
if locale and babel_length and babel_plural_form and key in _babel_units: | ||
_key = _babel_units[key] | ||
locale = babel_parse(locale) | ||
unit_patterns = locale._data["unit_patterns"] | ||
compound_unit_patterns = locale._data["compound_unit_patterns"] | ||
plural = "one" if abs(value) <= 0 else babel_plural_form | ||
if babel_length not in _babel_lengths: | ||
other_lengths = [ | ||
_babel_length | ||
for _babel_length in reversed(_babel_lengths) | ||
if babel_length != _babel_length | ||
] | ||
else: | ||
other_lengths = [] | ||
for _babel_length in [babel_length] + other_lengths: | ||
pat = unit_patterns.get(_key, {}).get(_babel_length, {}).get(plural) | ||
if pat is not None: | ||
# Don't remove this positional! This is the format used in Babel | ||
key = pat.replace("{0}", "").strip() | ||
break | ||
|
||
tmp = compound_unit_patterns.get("per", {}).get(babel_length, division_fmt) | ||
|
||
try: | ||
division_fmt = tmp.get("compound", division_fmt) | ||
except AttributeError: | ||
division_fmt = tmp | ||
power_fmt = "{}{}" | ||
exp_call = _pretty_fmt_exponent | ||
if value == 1: | ||
pos_terms.append(key) | ||
elif value > 0: | ||
pos_terms.append(power_fmt.format(key, fun(value))) | ||
elif value == -1 and as_ratio: | ||
neg_terms.append(key) | ||
else: | ||
neg_terms.append(power_fmt.format(key, fun(value))) | ||
|
||
if not as_ratio: | ||
# Show as Product: positive * negative terms ** -1 | ||
return _join(product_fmt, pos_terms + neg_terms) | ||
|
||
# Show as Ratio: positive terms / negative terms | ||
pos_ret = _join(product_fmt, pos_terms) or "1" | ||
|
||
if not neg_terms: | ||
return pos_ret | ||
|
||
if single_denominator: | ||
neg_ret = _join(product_fmt, neg_terms) | ||
if len(neg_terms) > 1: | ||
neg_ret = parentheses_fmt.format(neg_ret) | ||
else: | ||
neg_ret = _join(division_fmt, neg_terms) | ||
|
||
return _join(division_fmt, [pos_ret, neg_ret]) | ||
|
||
|
||
# Extract just the type from the specification mini-language: see | ||
# http://docs.python.org/2/library/string.html#format-specification-mini-language | ||
# We also add uS for uncertainties. | ||
_BASIC_TYPES = frozenset("bcdeEfFgGnosxX%uS") | ||
|
||
|
||
def _parse_spec(spec: str) -> str: | ||
# TODO: provisional | ||
from ...formatting import _FORMATTERS | ||
|
||
result = "" | ||
for ch in reversed(spec): | ||
if ch == "~" or ch in _BASIC_TYPES: | ||
continue | ||
elif ch in list(_FORMATTERS.keys()) + ["~"]: | ||
if result: | ||
raise ValueError("expected ':' after format specifier") | ||
else: | ||
result = ch | ||
elif ch.isalpha(): | ||
raise ValueError("Unknown conversion specified " + ch) | ||
else: | ||
break | ||
return result | ||
|
||
|
||
__JOIN_REG_EXP = re.compile(r"{\d*}") | ||
|
||
|
||
def _join(fmt: str, iterable: Iterable[Any]) -> str: | ||
"""Join an iterable with the format specified in fmt. | ||
The format can be specified in two ways: | ||
- PEP3101 format with two replacement fields (eg. '{} * {}') | ||
- The concatenating string (eg. ' * ') | ||
Parameters | ||
---------- | ||
fmt : str | ||
iterable : | ||
Returns | ||
------- | ||
str | ||
""" | ||
if not iterable: | ||
return "" | ||
if not __JOIN_REG_EXP.search(fmt): | ||
return fmt.join(iterable) | ||
miter = iter(iterable) | ||
first = next(miter) | ||
for val in miter: | ||
ret = fmt.format(first, val) | ||
first = ret | ||
return first | ||
|
||
|
||
_PRETTY_EXPONENTS = "⁰¹²³⁴⁵⁶⁷⁸⁹" | ||
|
||
|
||
def _pretty_fmt_exponent(num: Number) -> str: | ||
"""Format an number into a pretty printed exponent. | ||
Parameters | ||
---------- | ||
num : int | ||
Returns | ||
------- | ||
str | ||
""" | ||
# unicode dot operator (U+22C5) looks like a superscript decimal | ||
ret = f"{num:n}".replace("-", "⁻").replace(".", "\u22C5") | ||
for n in range(10): | ||
ret = ret.replace(str(n), _PRETTY_EXPONENTS[n]) | ||
return ret | ||
|
||
|
||
def extract_custom_flags(spec: str) -> str: | ||
import re | ||
|
||
if not spec: | ||
return "" | ||
|
||
# TODO: provisional | ||
from ...formatting import _FORMATTERS | ||
|
||
# sort by length, with longer items first | ||
known_flags = sorted(_FORMATTERS.keys(), key=len, reverse=True) | ||
|
||
flag_re = re.compile("(" + "|".join(known_flags + ["~"]) + ")") | ||
custom_flags = flag_re.findall(spec) | ||
|
||
return "".join(custom_flags) | ||
|
||
|
||
def remove_custom_flags(spec: str) -> str: | ||
# TODO: provisional | ||
from ...formatting import _FORMATTERS | ||
|
||
for flag in sorted(_FORMATTERS.keys(), key=len, reverse=True) + ["~"]: | ||
if flag: | ||
spec = spec.replace(flag, "") | ||
return spec | ||
|
||
|
||
def split_format( | ||
spec: str, default: str, separate_format_defaults: bool = True | ||
) -> tuple[str, str]: | ||
mspec = remove_custom_flags(spec) | ||
uspec = extract_custom_flags(spec) | ||
|
||
default_mspec = remove_custom_flags(default) | ||
default_uspec = extract_custom_flags(default) | ||
|
||
if separate_format_defaults in (False, None): | ||
# should we warn always or only if there was no explicit choice? | ||
# Given that we want to eventually remove the flag again, I'd say yes? | ||
if spec and separate_format_defaults is None: | ||
if not uspec and default_uspec: | ||
warnings.warn( | ||
( | ||
"The given format spec does not contain a unit formatter." | ||
" Falling back to the builtin defaults, but in the future" | ||
" the unit formatter specified in the `default_format`" | ||
" attribute will be used instead." | ||
), | ||
DeprecationWarning, | ||
) | ||
if not mspec and default_mspec: | ||
warnings.warn( | ||
( | ||
"The given format spec does not contain a magnitude formatter." | ||
" Falling back to the builtin defaults, but in the future" | ||
" the magnitude formatter specified in the `default_format`" | ||
" attribute will be used instead." | ||
), | ||
DeprecationWarning, | ||
) | ||
elif not spec: | ||
mspec, uspec = default_mspec, default_uspec | ||
else: | ||
mspec = mspec or default_mspec | ||
uspec = uspec or default_uspec | ||
|
||
return mspec, uspec |
Oops, something went wrong.