Skip to content

Commit b29daf1

Browse files
FasterSpeedingFasterSpeeding
committed
Post-rebase fixes
1 parent 2301241 commit b29daf1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1142
-1161
lines changed

Diff for: ‎hikari/api/event_manager.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
from hikari import iterators
3131
from hikari.events import base_events
32-
from hikari.internal import typing_backport
32+
from hikari.internal import typing_extensions
3333

3434
if typing.TYPE_CHECKING:
3535
import asyncio
@@ -109,7 +109,7 @@ def open(self) -> None:
109109
"""
110110

111111
@abc.abstractmethod
112-
@typing_backport.override
112+
@typing_extensions.override
113113
def filter(
114114
self,
115115
*predicates: typing.Union[tuple[str, typing.Any], typing.Callable[[base_events.EventT], bool]],

Diff for: ‎hikari/api/special_endpoints.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
from hikari import components as components_
5656
from hikari import polls
5757
from hikari import undefined
58-
from hikari.internal import typing_backport
58+
from hikari.internal import typing_extensions
5959

6060
if typing.TYPE_CHECKING:
6161
import types
@@ -541,7 +541,7 @@ class InteractionDeferredBuilder(InteractionResponseBuilder, abc.ABC):
541541

542542
@property
543543
@abc.abstractmethod
544-
@typing_backport.override
544+
@typing_extensions.override
545545
def type(self) -> base_interactions.DeferredResponseTypesT:
546546
"""Type of this response."""
547547

@@ -663,7 +663,7 @@ class InteractionMessageBuilder(InteractionResponseBuilder, abc.ABC):
663663

664664
@property
665665
@abc.abstractmethod
666-
@typing_backport.override
666+
@typing_extensions.override
667667
def type(self) -> base_interactions.MessageResponseTypesT:
668668
"""Type of this response."""
669669

@@ -959,7 +959,7 @@ class InteractionModalBuilder(InteractionResponseBuilder, abc.ABC):
959959

960960
@property
961961
@abc.abstractmethod
962-
@typing_backport.override
962+
@typing_extensions.override
963963
def type(self) -> typing.Literal[base_interactions.ResponseType.MODAL]:
964964
"""Type of this response."""
965965

@@ -1021,7 +1021,7 @@ class InteractionPremiumRequiredBuilder(InteractionResponseBuilder, abc.ABC):
10211021

10221022
@property
10231023
@abc.abstractmethod
1024-
@typing_backport.override
1024+
@typing_extensions.override
10251025
def type(self) -> typing.Literal[base_interactions.ResponseType.PREMIUM_REQUIRED]:
10261026
"""Type of this response."""
10271027

@@ -1315,7 +1315,7 @@ def add_option(self, option: commands.CommandOption) -> Self:
13151315
"""
13161316

13171317
@abc.abstractmethod
1318-
@typing_backport.override
1318+
@typing_extensions.override
13191319
async def create(
13201320
self,
13211321
rest: rest_api.RESTClient,
@@ -1353,7 +1353,7 @@ class ContextMenuCommandBuilder(CommandBuilder):
13531353
__slots__: typing.Sequence[str] = ()
13541354

13551355
@abc.abstractmethod
1356-
@typing_backport.override
1356+
@typing_extensions.override
13571357
async def create(
13581358
self,
13591359
rest: rest_api.RESTClient,
@@ -1414,7 +1414,7 @@ class ButtonBuilder(ComponentBuilder, abc.ABC):
14141414

14151415
@property
14161416
@abc.abstractmethod
1417-
@typing_backport.override
1417+
@typing_extensions.override
14181418
def type(self) -> typing.Literal[components_.ComponentType.BUTTON]:
14191419
"""Type of component this builder represents."""
14201420

@@ -1861,7 +1861,7 @@ class TextInputBuilder(ComponentBuilder, abc.ABC):
18611861

18621862
@property
18631863
@abc.abstractmethod
1864-
@typing_backport.override
1864+
@typing_extensions.override
18651865
def type(self) -> typing.Literal[components_.ComponentType.TEXT_INPUT]:
18661866
"""Type of component this builder represents."""
18671867

@@ -2038,7 +2038,7 @@ class MessageActionRowBuilder(ComponentBuilder, abc.ABC):
20382038

20392039
@property
20402040
@abc.abstractmethod
2041-
@typing_backport.override
2041+
@typing_extensions.override
20422042
def type(self) -> typing.Literal[components_.ComponentType.ACTION_ROW]:
20432043
"""Type of component this builder represents."""
20442044

@@ -2276,7 +2276,7 @@ class ModalActionRowBuilder(ComponentBuilder, abc.ABC):
22762276

22772277
@property
22782278
@abc.abstractmethod
2279-
@typing_backport.override
2279+
@typing_extensions.override
22802280
def type(self) -> typing.Literal[components_.ComponentType.ACTION_ROW]:
22812281
"""Type of component this builder represents."""
22822282

Diff for: ‎hikari/applications.py

+21-21
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
from hikari.internal import attrs_extensions
6363
from hikari.internal import enums
6464
from hikari.internal import routes
65-
from hikari.internal import typing_backport
65+
from hikari.internal import typing_extensions
6666

6767
if typing.TYPE_CHECKING:
6868
import datetime
@@ -375,90 +375,90 @@ class TeamMember(users.User):
375375
"""The user representation of this team member."""
376376

377377
@property
378-
@typing_backport.override
378+
@typing_extensions.override
379379
def app(self) -> traits.RESTAware:
380380
"""Return the app that is bound to the user object."""
381381
return self.user.app
382382

383383
@property
384-
@typing_backport.override
384+
@typing_extensions.override
385385
def avatar_hash(self) -> typing.Optional[str]:
386386
return self.user.avatar_hash
387387

388388
@property
389-
@typing_backport.override
389+
@typing_extensions.override
390390
def avatar_url(self) -> typing.Optional[files.URL]:
391391
return self.user.avatar_url
392392

393393
@property
394-
@typing_backport.override
394+
@typing_extensions.override
395395
def default_avatar_url(self) -> files.URL:
396396
return self.user.default_avatar_url
397397

398398
@property
399-
@typing_backport.override
399+
@typing_extensions.override
400400
def banner_hash(self) -> typing.Optional[str]:
401401
return self.user.banner_hash
402402

403403
@property
404-
@typing_backport.override
404+
@typing_extensions.override
405405
def banner_url(self) -> typing.Optional[files.URL]:
406406
return self.user.banner_url
407407

408408
@property
409-
@typing_backport.override
409+
@typing_extensions.override
410410
def accent_color(self) -> typing.Optional[colors.Color]:
411411
return self.user.accent_color
412412

413413
@property
414-
@typing_backport.override
414+
@typing_extensions.override
415415
def discriminator(self) -> str:
416416
return self.user.discriminator
417417

418418
@property
419-
@typing_backport.override
419+
@typing_extensions.override
420420
def flags(self) -> users.UserFlag:
421421
return self.user.flags
422422

423423
@property
424-
@typing_backport.override
424+
@typing_extensions.override
425425
def id(self) -> snowflakes.Snowflake:
426426
return self.user.id
427427

428428
@property
429-
@typing_backport.override
429+
@typing_extensions.override
430430
def is_bot(self) -> bool:
431431
return self.user.is_bot
432432

433433
@property
434-
@typing_backport.override
434+
@typing_extensions.override
435435
def is_system(self) -> bool:
436436
return self.user.is_system
437437

438438
@property
439-
@typing_backport.override
439+
@typing_extensions.override
440440
def mention(self) -> str:
441441
return self.user.mention
442442

443443
@property
444-
@typing_backport.override
444+
@typing_extensions.override
445445
def username(self) -> str:
446446
return self.user.username
447447

448448
@property
449-
@typing_backport.override
449+
@typing_extensions.override
450450
def global_name(self) -> typing.Optional[str]:
451451
return self.user.global_name
452452

453-
@typing_backport.override
453+
@typing_extensions.override
454454
def __str__(self) -> str:
455455
return str(self.user)
456456

457-
@typing_backport.override
457+
@typing_extensions.override
458458
def __hash__(self) -> int:
459459
return hash(self.user)
460460

461-
@typing_backport.override
461+
@typing_extensions.override
462462
def __eq__(self, other: object) -> bool:
463463
return self.user == other
464464

@@ -495,7 +495,7 @@ class Team(snowflakes.Unique):
495495
owner_id: snowflakes.Snowflake = attrs.field(eq=False, hash=False, repr=True)
496496
"""The ID of this team's owner."""
497497

498-
@typing_backport.override
498+
@typing_extensions.override
499499
def __str__(self) -> str:
500500
return f"Team {self.name} ({self.id})"
501501

@@ -768,7 +768,7 @@ class PartialOAuth2Token:
768768
scopes: typing.Sequence[typing.Union[OAuth2Scope, str]] = attrs.field(eq=False, hash=False, repr=True)
769769
"""Scopes the access token has access to."""
770770

771-
@typing_backport.override
771+
@typing_extensions.override
772772
def __str__(self) -> str:
773773
return self.access_token
774774

Diff for: ‎hikari/audit_logs.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
from hikari.internal import attrs_extensions
4848
from hikari.internal import collections
4949
from hikari.internal import enums
50-
from hikari.internal import typing_backport
50+
from hikari.internal import typing_extensions
5151

5252
if typing.TYPE_CHECKING:
5353
import datetime
@@ -630,16 +630,16 @@ def __getitem__(self, index: int, /) -> AuditLogEntry: ...
630630
@typing.overload
631631
def __getitem__(self, slice_: slice, /) -> typing.Sequence[AuditLogEntry]: ...
632632

633-
@typing_backport.override
633+
@typing_extensions.override
634634
def __getitem__(
635635
self, index_or_slice: typing.Union[int, slice], /
636636
) -> typing.Union[AuditLogEntry, typing.Sequence[AuditLogEntry]]:
637637
return collections.get_index_or_slice(self.entries, index_or_slice)
638638

639-
@typing_backport.override
639+
@typing_extensions.override
640640
def __iter__(self) -> typing.Iterator[AuditLogEntry]:
641641
return iter(self.entries.values())
642642

643-
@typing_backport.override
643+
@typing_extensions.override
644644
def __len__(self) -> int:
645645
return len(self.entries)

Diff for: ‎hikari/channels.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
from hikari.internal import attrs_extensions
7878
from hikari.internal import enums
7979
from hikari.internal import routes
80-
from hikari.internal import typing_backport
80+
from hikari.internal import typing_extensions
8181

8282
if typing.TYPE_CHECKING:
8383
import datetime
@@ -368,7 +368,7 @@ def mention(self) -> str:
368368
"""
369369
return f"<#{self.id}>"
370370

371-
@typing_backport.override
371+
@typing_extensions.override
372372
def __str__(self) -> str:
373373
return self.name if self.name is not None else f"Unnamed {self.__class__.__name__} ID {self.id}"
374374

@@ -855,7 +855,7 @@ def shard_id(self) -> typing.Literal[0]:
855855
"""Return the shard ID for the shard."""
856856
return 0
857857

858-
@typing_backport.override
858+
@typing_extensions.override
859859
def __str__(self) -> str:
860860
return f"{self.__class__.__name__} with: {self.recipient}"
861861

@@ -888,7 +888,7 @@ class GroupDMChannel(PrivateChannel):
888888
If the group DM was not created by a bot, this will be [`None`][].
889889
"""
890890

891-
@typing_backport.override
891+
@typing_extensions.override
892892
def __str__(self) -> str:
893893
if self.name is None:
894894
return f"{self.__class__.__name__} with: {', '.join(str(user) for user in self.recipients.values())}"

Diff for: ‎hikari/colors.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import string
2929
import typing
3030

31-
from hikari.internal import typing_backport
31+
from hikari.internal import typing_extensions
3232

3333

3434
def _to_rgb_int(value: str, name: str) -> int:
@@ -173,12 +173,12 @@ def __init__(self, raw_rgb: typing.SupportsInt) -> None:
173173
# than keeping the linter happy.
174174
super().__init__()
175175

176-
@typing_backport.override
176+
@typing_extensions.override
177177
def __repr__(self) -> str:
178178
r, g, b = self.rgb
179179
return f"Color(r={hex(r)}, g={hex(g)}, b={hex(b)})"
180180

181-
@typing_backport.override
181+
@typing_extensions.override
182182
def __str__(self) -> str:
183183
return self.hex_code
184184

@@ -525,7 +525,7 @@ def of(cls, value: Colorish, /) -> Color:
525525
msg = f"Could not transform {value!r} into a {cls.__qualname__} object"
526526
raise ValueError(msg)
527527

528-
@typing_backport.override
528+
@typing_extensions.override
529529
def to_bytes(
530530
self, length: typing.SupportsIndex, byteorder: typing.Literal["little", "big"], *, signed: bool = True
531531
) -> bytes:

Diff for: ‎hikari/embeds.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
from hikari import files
4646
from hikari import undefined
4747
from hikari.internal import attrs_extensions
48-
from hikari.internal import typing_backport
48+
from hikari.internal import typing_extensions
4949

5050
if typing.TYPE_CHECKING:
5151
import concurrent.futures
@@ -65,18 +65,18 @@ class EmbedResource(files.Resource[files.AsyncReader]):
6565

6666
@property
6767
@typing.final
68-
@typing_backport.override
68+
@typing_extensions.override
6969
def url(self) -> str:
7070
"""URL of this embed resource."""
7171
return self.resource.url
7272

7373
@property
74-
@typing_backport.override
74+
@typing_extensions.override
7575
def filename(self) -> str:
7676
"""File name of this embed resource."""
7777
return self.resource.filename
7878

79-
@typing_backport.override
79+
@typing_extensions.override
8080
def stream(
8181
self, *, executor: typing.Optional[concurrent.futures.Executor] = None, head_only: bool = False
8282
) -> files.AsyncReaderContextManager[files.AsyncReader]:
@@ -906,11 +906,11 @@ def clear_fields(self) -> Embed:
906906
self._fields = None
907907
return self
908908

909-
@typing_backport.override
909+
@typing_extensions.override
910910
def __repr__(self) -> str:
911911
return f"Embed(title={self.title}, color={self.color}, timestamp={self.timestamp})"
912912

913-
@typing_backport.override
913+
@typing_extensions.override
914914
def __eq__(self, other: object) -> bool:
915915
if isinstance(other, type(self)):
916916
for attrsib in self.__slots__:

0 commit comments

Comments
 (0)