diff --git a/bemani/backend/ddr/ddrsn2.py b/bemani/backend/ddr/ddrsn2.py index c01891c..c5e4a10 100644 --- a/bemani/backend/ddr/ddrsn2.py +++ b/bemani/backend/ddr/ddrsn2.py @@ -6,28 +6,12 @@ import logging import math from enum import IntEnum -from typing import Dict, Optional, Tuple +from typing import Optional from typing_extensions import Final -from ctypes import * +from ctypes import Structure, c_int8, c_int16, c_uint8, c_uint16, c_uint32, c_char from bemani.backend.ddr.base import DDRBase from bemani.backend.ddr.stubs import DDRSuperNova -from bemani.backend.ddr.common import ( - DDRGameFriendHandler, - DDRGameLockHandler, - DDRGameLoadCourseHandler, - DDRGameLoadHandler, - DDRGameLogHandler, - DDRGameMessageHandler, - DDRGameNewHandler, - DDRGameOldHandler, - DDRGameRankingHandler, - DDRGameSaveCourseHandler, - DDRGameSaveHandler, - DDRGameScoreHandler, - DDRGameShopHandler, - DDRGameTraceHandler, -) from bemani.common import VersionConstants, Profile, PlayStatistics, DBConstants, intish, Time from bemani.data import Score, UserID from bemani.protocol import Node @@ -655,7 +639,7 @@ class DDRSuperNova2( perf = intish(child.attribute("perf")) rank = intish(child.attribute("rank")) score = intish(child.attribute("score")) - except: + except ValueError: continue self.update_score( diff --git a/bemani/client/ddr/ddrsn2.py b/bemani/client/ddr/ddrsn2.py index 6827880..968fc06 100644 --- a/bemani/client/ddr/ddrsn2.py +++ b/bemani/client/ddr/ddrsn2.py @@ -316,7 +316,7 @@ class DDRSN2Client(BaseClient): # Verify empty profile (player_info, scores1, scores2) = self.verify_player_get(ref_id) if player_info is None: - raise Exception(f"Player info should not be None") + raise Exception("Player info should not be None") if player_info.name.decode("euc-jp").strip() != self.NAME: raise Exception(f"Player info name should be {self.NAME} not {player_info.name}") if player_info.count != 0: @@ -363,7 +363,7 @@ class DDRSN2Client(BaseClient): (player_info, scores1, scores2) = self.verify_player_get(ref_id) if player_info is None: - raise Exception(f"Player info should not be None") + raise Exception("Player info should not be None") if player_info.name.decode("euc-jp").strip() != self.NAME: raise Exception(f"Player info name should be {self.NAME} not {player_info.name}") if player_info.count != 1: