Skip to content

Commit

Permalink
Backport PR #46119: REF: isinstance(x, int) -> is_integer(x) (#46501)
Browse files Browse the repository at this point in the history
Co-authored-by: JHM Darbyshire <24256554+attack68@users.noreply.github.com>
Co-authored-by: Simon Hawkins <simonjayhawkins@gmail.com>
  • Loading branch information
3 people authored Mar 29, 2022
1 parent 1afa4d5 commit ccdb97e
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions pandas/io/formats/style_render.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
from pandas._typing import Level
from pandas.compat._optional import import_optional_dependency

from pandas.core.dtypes.common import (
is_complex,
is_float,
is_integer,
)
from pandas.core.dtypes.generic import ABCSeries

from pandas import (
Expand Down Expand Up @@ -1431,9 +1436,9 @@ def _default_formatter(x: Any, precision: int, thousands: bool = False) -> Any:
value : Any
Matches input type, or string if input is float or complex or int with sep.
"""
if isinstance(x, (float, complex)):
if is_float(x) or is_complex(x):
return f"{x:,.{precision}f}" if thousands else f"{x:.{precision}f}"
elif isinstance(x, int):
elif is_integer(x):
return f"{x:,.0f}" if thousands else f"{x:.0f}"
return x

Expand All @@ -1448,7 +1453,7 @@ def _wrap_decimal_thousands(
"""

def wrapper(x):
if isinstance(x, (float, complex, int)):
if is_float(x) or is_integer(x) or is_complex(x):
if decimal != "." and thousands is not None and thousands != ",":
return (
formatter(x)
Expand Down

0 comments on commit ccdb97e

Please sign in to comment.