Skip to content

Commit df54f0a

Browse files
committed
fix: remove usage of typing_extensions where possible
1 parent cdaf213 commit df54f0a

19 files changed

Lines changed: 67 additions & 54 deletions

File tree

packages/bigframes/bigframes/core/utils.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,19 @@
1616
import re
1717
import typing
1818
import warnings
19-
from typing import Hashable, Iterable, List
19+
from typing import Hashable, Iterable, List, TypeGuard
2020

2121
import bigframes_vendored.pandas.io.common as vendored_pandas_io_common
2222
import numpy as np
2323
import pandas as pd
24-
import typing_extensions
2524

2625
import bigframes.exceptions as bfe
2726

2827
UNNAMED_COLUMN_ID = "bigframes_unnamed_column"
2928
UNNAMED_INDEX_ID = "bigframes_unnamed_index"
3029

3130

32-
def is_gcs_path(value) -> typing_extensions.TypeGuard[str]:
31+
def is_gcs_path(value) -> TypeGuard[str]:
3332
return isinstance(value, str) and value.startswith("gs://")
3433

3534

@@ -43,11 +42,11 @@ def get_axis_number(axis: typing.Union[str, int]) -> typing.Literal[0, 1]:
4342

4443
def is_list_like(
4544
obj: typing.Any, allow_sets: bool = True
46-
) -> typing_extensions.TypeGuard[typing.Sequence]:
45+
) -> TypeGuard[typing.Sequence]:
4746
return pd.api.types.is_list_like(obj, allow_sets=allow_sets)
4847

4948

50-
def is_dict_like(obj: typing.Any) -> typing_extensions.TypeGuard[typing.Mapping]:
49+
def is_dict_like(obj: typing.Any) -> TypeGuard[typing.Mapping]:
5150
return pd.api.types.is_dict_like(obj)
5251

5352

packages/bigframes/bigframes/series.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
Optional,
3434
Sequence,
3535
Tuple,
36+
TypeGuard,
3637
TypeVar,
3738
Union,
3839
cast,
@@ -45,7 +46,6 @@
4546
import numpy
4647
import pandas
4748
import pyarrow as pa
48-
import typing_extensions
4949
from pandas.api import extensions as pd_ext
5050

5151
import bigframes.core
@@ -2825,5 +2825,5 @@ def _throw_if_null_index(self, opname: __builtins__.str):
28252825
)
28262826

28272827

2828-
def _is_list_like(obj: typing.Any) -> typing_extensions.TypeGuard[typing.Sequence]:
2828+
def _is_list_like(obj: typing.Any) -> TypeGuard[typing.Sequence]:
28292829
return pandas.api.types.is_list_like(obj)

packages/bigframes/third_party/bigframes_vendored/ibis/common/bases.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,18 @@
33
from __future__ import annotations
44

55
import collections.abc
6+
import sys
67
from abc import abstractmethod
78
from typing import TYPE_CHECKING, Any
89
from weakref import WeakValueDictionary
910

1011
if TYPE_CHECKING:
1112
from collections.abc import Mapping
1213

13-
from typing_extensions import Self
14+
if sys.version_info >= (3, 11):
15+
from typing import Self
16+
else:
17+
from typing_extensions import Self
1418

1519

1620
class AbstractMeta(type):

packages/bigframes/third_party/bigframes_vendored/ibis/common/collections.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from __future__ import annotations
44

55
import collections.abc
6+
import sys
67
from abc import abstractmethod
78
from itertools import tee
89
from typing import TYPE_CHECKING, Any, Generic, TypeVar
@@ -12,7 +13,10 @@
1213
from public import public
1314

1415
if TYPE_CHECKING:
15-
from typing_extensions import Self
16+
if sys.version_info >= (3, 11):
17+
from typing import Self
18+
else:
19+
from typing_extensions import Self
1620

1721
K = TypeVar("K", bound=collections.abc.Hashable)
1822
V = TypeVar("V")

packages/bigframes/third_party/bigframes_vendored/ibis/common/graph.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
from __future__ import annotations
66

77
import itertools
8+
import sys
89
from abc import abstractmethod
910
from collections import deque
1011
from collections.abc import Callable, Iterable, Iterator, KeysView, Mapping, Sequence
@@ -16,7 +17,10 @@
1617
from bigframes_vendored.ibis.util import experimental, promote_list
1718

1819
if TYPE_CHECKING:
19-
from typing_extensions import Self
20+
if sys.version_info >= (3, 11):
21+
from typing import Self
22+
else:
23+
from typing_extensions import Self
2024

2125
N = TypeVar("N")
2226

packages/bigframes/third_party/bigframes_vendored/ibis/common/grounds.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from __future__ import annotations
33

44
import contextlib
5+
import sys
56
from copy import copy
67
from typing import Any, ClassVar, Union, get_origin
78

@@ -23,7 +24,11 @@
2324
from bigframes_vendored.ibis.common.collections import FrozenDict # noqa: TCH001
2425
from bigframes_vendored.ibis.common.patterns import Pattern
2526
from bigframes_vendored.ibis.common.typing import evaluate_annotations
26-
from typing_extensions import Self, dataclass_transform
27+
28+
if sys.version_info >= (3, 11):
29+
from typing import Self, dataclass_transform
30+
else:
31+
from typing_extensions import Self, dataclass_transform
2732

2833

2934
class AnnotableMeta(AbstractMeta):

packages/bigframes/third_party/bigframes_vendored/ibis/common/typing.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,23 @@
77
import sys
88
from abc import abstractmethod
99
from itertools import zip_longest
10-
from typing import TYPE_CHECKING, Any, Optional, TypeVar, Union, get_args, get_origin
10+
from typing import TYPE_CHECKING, Any, Optional, TypeVar, get_args, get_origin
1111
from typing import get_type_hints as _get_type_hints
1212

1313
from bigframes_vendored.ibis.common.bases import Abstract
1414
from bigframes_vendored.ibis.common.caching import memoize
1515

1616
if TYPE_CHECKING:
17-
from typing_extensions import Self
18-
19-
if sys.version_info >= (3, 10):
20-
from types import UnionType
21-
from typing import TypeAlias
17+
if sys.version_info >= (3, 11):
18+
from typing import Self
19+
else:
20+
from typing_extensions import Self
2221

23-
# Keep this alias in sync with unittest.case._ClassInfo
24-
_ClassInfo: TypeAlias = type | UnionType | tuple["_ClassInfo", ...]
25-
else:
26-
from typing_extensions import TypeAlias
22+
from types import UnionType
23+
from typing import TypeAlias
2724

28-
UnionType = object()
29-
_ClassInfo: TypeAlias = Union[type, tuple["_ClassInfo", ...]]
25+
# Keep this alias in sync with unittest.case._ClassInfo
26+
_ClassInfo: TypeAlias = type | UnionType | tuple["_ClassInfo", ...]
3027

3128

3229
T = TypeVar("T")

packages/bigframes/third_party/bigframes_vendored/ibis/expr/builders.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from __future__ import annotations
44

55
import math
6+
import sys
67
from typing import TYPE_CHECKING, Any, Literal, Optional, Union
78

89
import bigframes_vendored.ibis
@@ -19,7 +20,10 @@
1920
from bigframes_vendored.ibis.common.typing import VarTuple # noqa: TCH001
2021

2122
if TYPE_CHECKING:
22-
from typing_extensions import Self
23+
if sys.version_info >= (3, 11):
24+
from typing import Self
25+
else:
26+
from typing_extensions import Self
2327

2428

2529
class Builder(Concrete):

packages/bigframes/third_party/bigframes_vendored/ibis/expr/datatypes/core.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import datetime as pydatetime
66
import decimal as pydecimal
77
import numbers
8+
import sys
89
import uuid as pyuuid
910
from abc import abstractmethod
1011
from collections.abc import Iterable, Iterator, Mapping, Sequence
@@ -29,7 +30,11 @@
2930
from bigframes_vendored.ibis.common.patterns import Coercible, CoercionError
3031
from bigframes_vendored.ibis.common.temporal import IntervalUnit, TimestampUnit
3132
from public import public
32-
from typing_extensions import Self
33+
34+
if sys.version_info >= (3, 11):
35+
from typing import Self
36+
else:
37+
from typing_extensions import Self
3338

3439

3540
@lazy_singledispatch

packages/bigframes/third_party/bigframes_vendored/ibis/expr/operations/core.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
from __future__ import annotations
44

55
from abc import abstractmethod
6-
from typing import Generic, Optional
6+
from typing import Any, Generic, Optional, TypeVar
77

8+
import sys
89
import bigframes_vendored.ibis.expr.datashape as ds
910
import bigframes_vendored.ibis.expr.datatypes as dt
1011
import bigframes_vendored.ibis.expr.rules as rlz
@@ -15,7 +16,11 @@
1516
from bigframes_vendored.ibis.common.typing import DefaultTypeVars
1617
from bigframes_vendored.ibis.util import is_iterable
1718
from public import public
18-
from typing_extensions import Any, Self, TypeVar
19+
20+
if sys.version_info >= (3, 11):
21+
from typing import Self
22+
else:
23+
from typing_extensions import Self
1924

2025

2126
@public

0 commit comments

Comments
 (0)