Skip to content

Commit f3a1466

Browse files
committed
Merge branch 'master' of https://github.com/TwitchIO/TwitchIO
2 parents c9a6f87 + ac78a4e commit f3a1466

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

twitchio/ext/commands/core.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,11 @@ def get_user(self, name: str) -> Optional[Union[PartialUser, User]]:
459459

460460
return None
461461

462+
462463
C = TypeVar("C", bound="Command")
463464
G = TypeVar("G", bound="Group")
464465

466+
465467
def command(
466468
*, name: str = None, aliases: Union[list, tuple] = None, cls: C = Command, no_global_checks=False
467469
) -> Callable[[Callable], C]:

twitchio/models.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,7 @@ def __init__(self, http: "TwitchHTTP", data: dict, broadcaster: Optional[Union[P
225225
)
226226
self.user = PartialUser(http, data["event_data"]["user_id"], data["event_data"]["user_name"])
227227
self.expires_at = (
228-
parse_timestamp(data["event_data"]["expires_at"])
229-
if data["event_data"]["expires_at"]
230-
else None
228+
parse_timestamp(data["event_data"]["expires_at"]) if data["event_data"]["expires_at"] else None
231229
)
232230

233231
def __repr__(self):
@@ -684,9 +682,7 @@ def __init__(self, data: dict):
684682
self.start_time = parse_timestamp(data["start_time"])
685683
self.end_time = parse_timestamp(data["end_time"])
686684
self.title: str = data["title"]
687-
self.canceled_until = (
688-
parse_timestamp(data["canceled_until"]) if data["canceled_until"] else None
689-
)
685+
self.canceled_until = parse_timestamp(data["canceled_until"]) if data["canceled_until"] else None
690686
self.category = ScheduleCategory(data["category"]) if data["category"] else None
691687
self.is_recurring: bool = data["is_recurring"]
692688

twitchio/user.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ def __init__(self, http: "TwitchHTTP", data: dict):
852852
self.description: str = data["description"]
853853
self.profile_image: str = data["profile_image_url"]
854854
self.offline_image: str = data["offline_image_url"]
855-
self.view_count: Tuple[int] = (data["view_count"],) # this isn't supposed to be a tuple but too late to fix it!
855+
self.view_count: Tuple[int] = (data["view_count"],) # this isn't supposed to be a tuple but too late to fix it!
856856
self.created_at = parse_timestamp(data["created_at"])
857857
self.email: Optional[str] = data.get("email")
858858
self._cached_rewards = None

twitchio/utils.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import datetime
22
import iso8601
33

4-
__all__ = (
5-
"parse_timestamp",
6-
)
4+
__all__ = ("parse_timestamp",)
5+
76

87
def parse_timestamp(timestamp: str) -> datetime.datetime:
98
"""
@@ -19,4 +18,4 @@ def parse_timestamp(timestamp: str) -> datetime.datetime:
1918
The parsed timestamp.
2019
2120
"""
22-
return iso8601.parse_date(timestamp, datetime.timezone.utc)
21+
return iso8601.parse_date(timestamp, datetime.timezone.utc)

0 commit comments

Comments
 (0)