Skip to content

Commit c6c7817

Browse files
authored
Fix utcfromtimestamp deprecation in resources file
1 parent a435b39 commit c6c7817

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

sc2reader/resources.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,10 @@ def load_details(self):
411411

412412
self.windows_timestamp = details["file_time"]
413413
self.unix_timestamp = utils.windows_to_unix(self.windows_timestamp)
414-
self.end_time = datetime.utcfromtimestamp(self.unix_timestamp)
414+
self.end_time = datetime.fromtimestamp(
415+
self.unix_timestamp,
416+
datetime.UTC
417+
)
415418

416419
# The utc_adjustment is either the adjusted windows timestamp OR
417420
# the value required to get the adjusted timestamp. We know the upper
@@ -429,8 +432,9 @@ def load_details(self):
429432
seconds=self.length.seconds
430433
// GAME_SPEED_FACTOR[self.expansion].get(self.speed, 1.0)
431434
)
432-
self.start_time = datetime.utcfromtimestamp(
433-
self.unix_timestamp - self.real_length.seconds
435+
self.start_time = datetime.fromtimestamp(
436+
self.unix_timestamp - self.real_length.seconds,
437+
datetime.UTC
434438
)
435439
self.date = self.end_time # backwards compatibility
436440

@@ -1088,16 +1092,20 @@ def __init__(self, summary_file, filename=None, lang="enUS", **options):
10881092
else:
10891093
self.expansion = ""
10901094

1091-
self.end_time = datetime.utcfromtimestamp(self.parts[0][8])
1095+
self.end_time = datetime.fromtimestamp(
1096+
self.parts[0][8],
1097+
datetime.UTC
1098+
)
10921099
self.game_speed = LOBBY_PROPERTIES[0xBB8][1][self.parts[0][0][1].decode("utf8")]
10931100
self.game_length = utils.Length(seconds=self.parts[0][7])
10941101
self.real_length = utils.Length(
10951102
seconds=int(
10961103
self.parts[0][7] / GAME_SPEED_FACTOR[self.expansion][self.game_speed]
10971104
)
10981105
)
1099-
self.start_time = datetime.utcfromtimestamp(
1100-
self.parts[0][8] - self.real_length.seconds
1106+
self.start_time = datetime.fromtimestamp(
1107+
self.parts[0][8] - self.real_length.seconds,
1108+
datetime.UTC
11011109
)
11021110

11031111
self.load_map_info()

0 commit comments

Comments
 (0)