From c89c12062d16e4991e1da7c655a3baab48644d58 Mon Sep 17 00:00:00 2001 From: Jennifer Taylor Date: Tue, 10 Dec 2019 01:10:14 +0000 Subject: [PATCH] Upgrade to latest flake8, address new flake issues. --- bemani/api/__init__.py | 6 ++++++ bemani/api/objects/__init__.py | 9 +++++++++ bemani/backend/__init__.py | 7 +++++++ bemani/backend/bishi/__init__.py | 6 ++++++ bemani/backend/core/__init__.py | 7 +++++++ bemani/backend/ddr/__init__.py | 6 ++++++ bemani/backend/ess/__init__.py | 5 +++++ bemani/backend/iidx/__init__.py | 6 ++++++ bemani/backend/jubeat/__init__.py | 6 ++++++ bemani/backend/museca/__init__.py | 6 ++++++ bemani/backend/popn/__init__.py | 6 ++++++ bemani/backend/reflec/__init__.py | 6 ++++++ bemani/backend/sdvx/__init__.py | 6 ++++++ bemani/client/__init__.py | 6 ++++++ bemani/client/bishi/__init__.py | 5 +++++ bemani/client/ddr/__init__.py | 9 +++++++++ bemani/client/iidx/__init__.py | 9 +++++++++ bemani/client/jubeat/__init__.py | 9 +++++++++ bemani/client/museca/__init__.py | 6 ++++++ bemani/client/popn/__init__.py | 10 ++++++++++ bemani/client/reflec/__init__.py | 10 ++++++++++ bemani/client/sdvx/__init__.py | 9 +++++++++ bemani/common/__init__.py | 18 ++++++++++++++++++ bemani/data/__init__.py | 22 ++++++++++++++++++++++ bemani/format/__init__.py | 10 ++++++++++ bemani/frontend/__init__.py | 8 ++++++++ bemani/frontend/account/__init__.py | 5 +++++ bemani/frontend/admin/__init__.py | 5 +++++ bemani/frontend/arcade/__init__.py | 5 +++++ bemani/frontend/bishi/__init__.py | 6 ++++++ bemani/frontend/ddr/__init__.py | 6 ++++++ bemani/frontend/home/__init__.py | 5 +++++ bemani/frontend/iidx/__init__.py | 6 ++++++ bemani/frontend/jubeat/__init__.py | 6 ++++++ bemani/frontend/museca/__init__.py | 6 ++++++ bemani/frontend/popn/__init__.py | 6 ++++++ bemani/frontend/reflec/__init__.py | 6 ++++++ bemani/frontend/sdvx/__init__.py | 6 ++++++ bemani/frontend/static/__init__.py | 5 +++++ bemani/frontend/templates/__init__.py | 5 +++++ bemani/protocol/__init__.py | 6 ++++++ bemani/protocol/node.py | 2 +- bemani/sniff/__init__.py | 5 +++++ bemani/utils/bemanishark.py | 4 ++-- requirements.txt | 2 +- verifylint | 2 +- verifytyping | 2 -- 47 files changed, 307 insertions(+), 7 deletions(-) diff --git a/bemani/api/__init__.py b/bemani/api/__init__.py index 0a413cf..40c01b3 100644 --- a/bemani/api/__init__.py +++ b/bemani/api/__init__.py @@ -1 +1,7 @@ from bemani.api.app import app, config + + +__all__ = [ + "app", + "config", +] diff --git a/bemani/api/objects/__init__.py b/bemani/api/objects/__init__.py index 3cae93a..7931ecd 100644 --- a/bemani/api/objects/__init__.py +++ b/bemani/api/objects/__init__.py @@ -3,3 +3,12 @@ from bemani.api.objects.catalog import CatalogObject from bemani.api.objects.records import RecordsObject from bemani.api.objects.profile import ProfileObject from bemani.api.objects.statistics import StatisticsObject + + +__all__ = [ + "BaseObject", + "CatalogObject", + "RecordsObject", + "ProfileObject", + "StatisticsObject", +] diff --git a/bemani/backend/__init__.py b/bemani/backend/__init__.py index 1da790c..a6f1ae0 100644 --- a/bemani/backend/__init__.py +++ b/bemani/backend/__init__.py @@ -1,2 +1,9 @@ from bemani.backend.dispatch import Dispatch, UnrecognizedPCBIDException from bemani.backend.base import Base + + +__all__ = [ + "Dispatch", + "UnrecognizedPCBIDException", + "Base", +] diff --git a/bemani/backend/bishi/__init__.py b/bemani/backend/bishi/__init__.py index b61eb13..af5dd73 100644 --- a/bemani/backend/bishi/__init__.py +++ b/bemani/backend/bishi/__init__.py @@ -1,2 +1,8 @@ from bemani.backend.bishi.factory import BishiBashiFactory from bemani.backend.bishi.base import BishiBashiBase + + +__all__ = [ + "BishiBashiFactory", + "BishiBashiBase", +] diff --git a/bemani/backend/core/__init__.py b/bemani/backend/core/__init__.py index 9c39e10..eb956d3 100644 --- a/bemani/backend/core/__init__.py +++ b/bemani/backend/core/__init__.py @@ -1,3 +1,10 @@ from bemani.backend.core.core import CoreHandler from bemani.backend.core.cardmng import CardManagerHandler from bemani.backend.core.eacoin import PASELIHandler + + +__all__ = [ + "CoreHandler", + "CardManagerHandler", + "PASELIHandler", +] diff --git a/bemani/backend/ddr/__init__.py b/bemani/backend/ddr/__init__.py index 63712bd..2a1ce83 100644 --- a/bemani/backend/ddr/__init__.py +++ b/bemani/backend/ddr/__init__.py @@ -1,2 +1,8 @@ from bemani.backend.ddr.factory import DDRFactory from bemani.backend.ddr.base import DDRBase + + +__all__ = [ + "DDRFactory", + "DDRBase", +] diff --git a/bemani/backend/ess/__init__.py b/bemani/backend/ess/__init__.py index 1482488..f504030 100644 --- a/bemani/backend/ess/__init__.py +++ b/bemani/backend/ess/__init__.py @@ -1 +1,6 @@ from bemani.backend.ess.eventlog import EventLogHandler + + +__all__ = [ + "EventLogHandler", +] diff --git a/bemani/backend/iidx/__init__.py b/bemani/backend/iidx/__init__.py index 73b7ff8..b7873f3 100644 --- a/bemani/backend/iidx/__init__.py +++ b/bemani/backend/iidx/__init__.py @@ -1,2 +1,8 @@ from bemani.backend.iidx.factory import IIDXFactory from bemani.backend.iidx.base import IIDXBase + + +__all__ = [ + "IIDXFactory", + "IIDXBase", +] diff --git a/bemani/backend/jubeat/__init__.py b/bemani/backend/jubeat/__init__.py index 028c492..f38b1ba 100644 --- a/bemani/backend/jubeat/__init__.py +++ b/bemani/backend/jubeat/__init__.py @@ -1,2 +1,8 @@ from bemani.backend.jubeat.factory import JubeatFactory from bemani.backend.jubeat.base import JubeatBase + + +__all__ = [ + "JubeatFactory", + "JubeatBase", +] diff --git a/bemani/backend/museca/__init__.py b/bemani/backend/museca/__init__.py index 7473d32..d36dd99 100644 --- a/bemani/backend/museca/__init__.py +++ b/bemani/backend/museca/__init__.py @@ -1,2 +1,8 @@ from bemani.backend.museca.factory import MusecaFactory from bemani.backend.museca.base import MusecaBase + + +__all__ = [ + "MusecaFactory", + "MusecaBase", +] diff --git a/bemani/backend/popn/__init__.py b/bemani/backend/popn/__init__.py index d5dd4b0..7b0f845 100644 --- a/bemani/backend/popn/__init__.py +++ b/bemani/backend/popn/__init__.py @@ -1,2 +1,8 @@ from bemani.backend.popn.factory import PopnMusicFactory from bemani.backend.popn.base import PopnMusicBase + + +__all__ = [ + "PopnMusicFactory", + "PopnMusicBase", +] diff --git a/bemani/backend/reflec/__init__.py b/bemani/backend/reflec/__init__.py index 4de33e7..69662c0 100644 --- a/bemani/backend/reflec/__init__.py +++ b/bemani/backend/reflec/__init__.py @@ -1,2 +1,8 @@ from bemani.backend.reflec.factory import ReflecBeatFactory from bemani.backend.reflec.base import ReflecBeatBase + + +__all__ = [ + "ReflecBeatFactory", + "ReflecBeatBase", +] diff --git a/bemani/backend/sdvx/__init__.py b/bemani/backend/sdvx/__init__.py index 4d87b35..5625eba 100644 --- a/bemani/backend/sdvx/__init__.py +++ b/bemani/backend/sdvx/__init__.py @@ -1,2 +1,8 @@ from bemani.backend.sdvx.factory import SoundVoltexFactory from bemani.backend.sdvx.base import SoundVoltexBase + + +__all__ = [ + "SoundVoltexFactory", + "SoundVoltexBase", +] diff --git a/bemani/client/__init__.py b/bemani/client/__init__.py index a2fdba9..23f9e62 100644 --- a/bemani/client/__init__.py +++ b/bemani/client/__init__.py @@ -1,2 +1,8 @@ from bemani.client.base import BaseClient from bemani.client.protocol import ClientProtocol + + +__all__ = [ + "BaseClient", + "ClientProtocol", +] diff --git a/bemani/client/bishi/__init__.py b/bemani/client/bishi/__init__.py index 283303f..fd7ade0 100644 --- a/bemani/client/bishi/__init__.py +++ b/bemani/client/bishi/__init__.py @@ -1 +1,6 @@ from bemani.client.bishi.bishi import TheStarBishiBashiClient + + +__all__ = [ + "TheStarBishiBashiClient", +] diff --git a/bemani/client/ddr/__init__.py b/bemani/client/ddr/__init__.py index cba5c61..51bd462 100644 --- a/bemani/client/ddr/__init__.py +++ b/bemani/client/ddr/__init__.py @@ -3,3 +3,12 @@ from bemani.client.ddr.ddrx3 import DDRX3Client from bemani.client.ddr.ddr2013 import DDR2013Client from bemani.client.ddr.ddr2014 import DDR2014Client from bemani.client.ddr.ddrace import DDRAceClient + + +__all__ = [ + "DDRX2Client", + "DDRX3Client", + "DDR2013Client", + "DDR2014Client", + "DDRAceClient", +] diff --git a/bemani/client/iidx/__init__.py b/bemani/client/iidx/__init__.py index d54bb6a..37ef26e 100644 --- a/bemani/client/iidx/__init__.py +++ b/bemani/client/iidx/__init__.py @@ -3,3 +3,12 @@ from bemani.client.iidx.spada import IIDXSpadaClient from bemani.client.iidx.pendual import IIDXPendualClient from bemani.client.iidx.copula import IIDXCopulaClient from bemani.client.iidx.sinobuz import IIDXSinobuzClient + + +__all__ = [ + "IIDXTricoroClient", + "IIDXSpadaClient", + "IIDXPendualClient", + "IIDXCopulaClient", + "IIDXSinobuzClient", +] diff --git a/bemani/client/jubeat/__init__.py b/bemani/client/jubeat/__init__.py index 280b8f7..fa90f06 100644 --- a/bemani/client/jubeat/__init__.py +++ b/bemani/client/jubeat/__init__.py @@ -3,3 +3,12 @@ from bemani.client.jubeat.saucerfulfill import JubeatSaucerFulfillClient from bemani.client.jubeat.prop import JubeatPropClient from bemani.client.jubeat.qubell import JubeatQubellClient from bemani.client.jubeat.clan import JubeatClanClient + + +__all__ = [ + "JubeatSaucerClient", + "JubeatSaucerFulfillClient", + "JubeatPropClient", + "JubeatQubellClient", + "JubeatClanClient", +] diff --git a/bemani/client/museca/__init__.py b/bemani/client/museca/__init__.py index 521ff9d..2c4e10f 100644 --- a/bemani/client/museca/__init__.py +++ b/bemani/client/museca/__init__.py @@ -1,2 +1,8 @@ from bemani.client.museca.museca1 import Museca1Client from bemani.client.museca.museca1plus import Museca1PlusClient + + +__all__ = [ + "Museca1Client", + "Museca1PlusClient", +] diff --git a/bemani/client/popn/__init__.py b/bemani/client/popn/__init__.py index 4465ec6..8a95aea 100644 --- a/bemani/client/popn/__init__.py +++ b/bemani/client/popn/__init__.py @@ -4,3 +4,13 @@ from bemani.client.popn.sunnypark import PopnMusicSunnyParkClient from bemani.client.popn.lapistoria import PopnMusicLapistoriaClient from bemani.client.popn.eclale import PopnMusicEclaleClient from bemani.client.popn.usaneko import PopnMusicUsaNekoClient + + +__all__ = [ + "PopnMusicTuneStreetClient", + "PopnMusicFantasiaClient", + "PopnMusicSunnyParkClient", + "PopnMusicLapistoriaClient", + "PopnMusicEclaleClient", + "PopnMusicUsaNekoClient", +] diff --git a/bemani/client/reflec/__init__.py b/bemani/client/reflec/__init__.py index 8e51d06..95bee0a 100644 --- a/bemani/client/reflec/__init__.py +++ b/bemani/client/reflec/__init__.py @@ -4,3 +4,13 @@ from bemani.client.reflec.colette import ReflecBeatColette from bemani.client.reflec.groovin import ReflecBeatGroovinUpper from bemani.client.reflec.volzza import ReflecBeatVolzza from bemani.client.reflec.volzza2 import ReflecBeatVolzza2 + + +__all__ = [ + "ReflecBeat", + "ReflecBeatLimelight", + "ReflecBeatColette", + "ReflecBeatGroovinUpper", + "ReflecBeatVolzza", + "ReflecBeatVolzza2", +] diff --git a/bemani/client/sdvx/__init__.py b/bemani/client/sdvx/__init__.py index 2baaf01..b151898 100644 --- a/bemani/client/sdvx/__init__.py +++ b/bemani/client/sdvx/__init__.py @@ -3,3 +3,12 @@ from bemani.client.sdvx.infiniteinfection import SoundVoltexInfiniteInfectionCli from bemani.client.sdvx.gravitywars_s1 import SoundVoltexGravityWarsS1Client from bemani.client.sdvx.gravitywars_s2 import SoundVoltexGravityWarsS2Client from bemani.client.sdvx.heavenlyhaven import SoundVoltexHeavenlyHavenClient + + +__all__ = [ + "SoundVoltexBoothClient", + "SoundVoltexInfiniteInfectionClient", + "SoundVoltexGravityWarsS1Client", + "SoundVoltexGravityWarsS2Client", + "SoundVoltexHeavenlyHavenClient", +] diff --git a/bemani/common/__init__.py b/bemani/common/__init__.py index f2b811e..0f8f9ac 100644 --- a/bemani/common/__init__.py +++ b/bemani/common/__init__.py @@ -7,3 +7,21 @@ from bemani.common.id import ID from bemani.common.aes import AESCipher from bemani.common.time import Time from bemani.common.parallel import Parallel + + +__all__ = [ + "Model", + "ValidatedDict", + "HTTP", + "APIConstants", + "GameConstants", + "VersionConstants", + "DBConstants", + "CardCipher", + "CardCipherException", + "ID", + "AESCipher", + "Time", + "Parallel", + "intish", +] diff --git a/bemani/data/__init__.py b/bemani/data/__init__.py index 6360d8f..b4aeccd 100644 --- a/bemani/data/__init__.py +++ b/bemani/data/__init__.py @@ -2,3 +2,25 @@ from bemani.data.data import Data, DBCreateException from bemani.data.exceptions import ScoreSaveException from bemani.data.types import User, Achievement, Machine, Arcade, Score, Attempt, News, Link, Song, Event, Server, Client, UserID, ArcadeID from bemani.data.remoteuser import RemoteUser + + +__all__ = [ + "Data", + "DBCreateException", + "ScoreSaveException", + "User", + "Achievement", + "Machine", + "Arcade", + "Score", + "Attempt", + "News", + "Link", + "Song", + "Event", + "Server", + "Client", + "UserID", + "ArcadeID", + "RemoteUser", +] diff --git a/bemani/format/__init__.py b/bemani/format/__init__.py index d9d1dfe..e64ab35 100644 --- a/bemani/format/__init__.py +++ b/bemani/format/__init__.py @@ -3,3 +3,13 @@ from bemani.format.arc import ARC from bemani.format.twodx import TwoDX from bemani.format.iidxchart import IIDXChart from bemani.format.iidxmusicdb import IIDXMusicDB, IIDXSong + + +__all__ = [ + "IFS", + "ARC", + "TwoDX", + "IIDXChart", + "IIDXMusicDB", + "IIDXSong", +] diff --git a/bemani/frontend/__init__.py b/bemani/frontend/__init__.py index 1135c7a..02176c6 100644 --- a/bemani/frontend/__init__.py +++ b/bemani/frontend/__init__.py @@ -1 +1,9 @@ from bemani.frontend.app import app, config, loginrequired, loginprohibited + + +__all__ = [ + "app", + "config", + "loginrequired", + "loginprohibited", +] diff --git a/bemani/frontend/account/__init__.py b/bemani/frontend/account/__init__.py index de65504..db98e0e 100644 --- a/bemani/frontend/account/__init__.py +++ b/bemani/frontend/account/__init__.py @@ -1 +1,6 @@ from bemani.frontend.account.account import account_pages + + +__all__ = [ + "account_pages", +] diff --git a/bemani/frontend/admin/__init__.py b/bemani/frontend/admin/__init__.py index fb44c55..827c10d 100644 --- a/bemani/frontend/admin/__init__.py +++ b/bemani/frontend/admin/__init__.py @@ -1 +1,6 @@ from bemani.frontend.admin.admin import admin_pages + + +__all__ = [ + "admin_pages", +] diff --git a/bemani/frontend/arcade/__init__.py b/bemani/frontend/arcade/__init__.py index d325c9c..b6246cb 100644 --- a/bemani/frontend/arcade/__init__.py +++ b/bemani/frontend/arcade/__init__.py @@ -1 +1,6 @@ from bemani.frontend.arcade.arcade import arcade_pages + + +__all__ = [ + "arcade_pages", +] diff --git a/bemani/frontend/bishi/__init__.py b/bemani/frontend/bishi/__init__.py index bac7767..f2d5ea3 100644 --- a/bemani/frontend/bishi/__init__.py +++ b/bemani/frontend/bishi/__init__.py @@ -1,2 +1,8 @@ from bemani.frontend.bishi.endpoints import bishi_pages from bemani.frontend.bishi.cache import BishiBashiCache + + +__all__ = [ + "BishiBashiCache", + "bishi_pages", +] diff --git a/bemani/frontend/ddr/__init__.py b/bemani/frontend/ddr/__init__.py index 6955dd3..4be18d6 100644 --- a/bemani/frontend/ddr/__init__.py +++ b/bemani/frontend/ddr/__init__.py @@ -1,2 +1,8 @@ from bemani.frontend.ddr.endpoints import ddr_pages from bemani.frontend.ddr.cache import DDRCache + + +__all__ = [ + "DDRCache", + "ddr_pages", +] diff --git a/bemani/frontend/home/__init__.py b/bemani/frontend/home/__init__.py index b7b7399..558a11a 100644 --- a/bemani/frontend/home/__init__.py +++ b/bemani/frontend/home/__init__.py @@ -1 +1,6 @@ from bemani.frontend.home.home import home_pages + + +__all__ = [ + "home_pages", +] diff --git a/bemani/frontend/iidx/__init__.py b/bemani/frontend/iidx/__init__.py index 8c8a0bd..93f8cb2 100644 --- a/bemani/frontend/iidx/__init__.py +++ b/bemani/frontend/iidx/__init__.py @@ -1,2 +1,8 @@ from bemani.frontend.iidx.endpoints import iidx_pages from bemani.frontend.iidx.cache import IIDXCache + + +__all__ = [ + "IIDXCache", + "iidx_pages", +] diff --git a/bemani/frontend/jubeat/__init__.py b/bemani/frontend/jubeat/__init__.py index 06c76b6..dda09e8 100644 --- a/bemani/frontend/jubeat/__init__.py +++ b/bemani/frontend/jubeat/__init__.py @@ -1,2 +1,8 @@ from bemani.frontend.jubeat.endpoints import jubeat_pages from bemani.frontend.jubeat.cache import JubeatCache + + +__all__ = [ + "JubeatCache", + "jubeat_pages", +] diff --git a/bemani/frontend/museca/__init__.py b/bemani/frontend/museca/__init__.py index 4e7dc3c..385f9a8 100644 --- a/bemani/frontend/museca/__init__.py +++ b/bemani/frontend/museca/__init__.py @@ -1,2 +1,8 @@ from bemani.frontend.museca.endpoints import museca_pages from bemani.frontend.museca.cache import MusecaCache + + +__all__ = [ + "MusecaCache", + "museca_pages", +] diff --git a/bemani/frontend/popn/__init__.py b/bemani/frontend/popn/__init__.py index 08839c7..d2c6b47 100644 --- a/bemani/frontend/popn/__init__.py +++ b/bemani/frontend/popn/__init__.py @@ -1,2 +1,8 @@ from bemani.frontend.popn.endpoints import popn_pages from bemani.frontend.popn.cache import PopnMusicCache + + +__all__ = [ + "PopnMusicCache", + "popn_pages", +] diff --git a/bemani/frontend/reflec/__init__.py b/bemani/frontend/reflec/__init__.py index 85006e5..0f74a1c 100644 --- a/bemani/frontend/reflec/__init__.py +++ b/bemani/frontend/reflec/__init__.py @@ -1,2 +1,8 @@ from bemani.frontend.reflec.endpoints import reflec_pages from bemani.frontend.reflec.cache import ReflecBeatCache + + +__all__ = [ + "ReflecBeatCache", + "reflec_pages", +] diff --git a/bemani/frontend/sdvx/__init__.py b/bemani/frontend/sdvx/__init__.py index 6b1cc54..d0ac4d9 100644 --- a/bemani/frontend/sdvx/__init__.py +++ b/bemani/frontend/sdvx/__init__.py @@ -1,2 +1,8 @@ from bemani.frontend.sdvx.endpoints import sdvx_pages from bemani.frontend.sdvx.cache import SoundVoltexCache + + +__all__ = [ + "SoundVoltexCache", + "sdvx_pages", +] diff --git a/bemani/frontend/static/__init__.py b/bemani/frontend/static/__init__.py index c1bf509..a1d4516 100644 --- a/bemani/frontend/static/__init__.py +++ b/bemani/frontend/static/__init__.py @@ -1,3 +1,8 @@ import os static_location = os.path.abspath(os.path.dirname(__file__)) + + +__all__ = [ + "static_location", +] diff --git a/bemani/frontend/templates/__init__.py b/bemani/frontend/templates/__init__.py index 786afc8..b652fcc 100644 --- a/bemani/frontend/templates/__init__.py +++ b/bemani/frontend/templates/__init__.py @@ -1,3 +1,8 @@ import os templates_location = os.path.abspath(os.path.dirname(__file__)) + + +__all__ = [ + "templates_location", +] diff --git a/bemani/protocol/__init__.py b/bemani/protocol/__init__.py index ede896f..7716ad0 100644 --- a/bemani/protocol/__init__.py +++ b/bemani/protocol/__init__.py @@ -1,2 +1,8 @@ from bemani.protocol.protocol import EAmuseProtocol, EAmuseException from bemani.protocol.node import Node + +__all__ = [ + "EAmuseProtocol", + "EAmuseException", + "Node", +] diff --git a/bemani/protocol/node.py b/bemani/protocol/node.py index 7b73a7b..50a8024 100644 --- a/bemani/protocol/node.py +++ b/bemani/protocol/node.py @@ -857,7 +857,7 @@ class Node: return False return True - except Exception as e: + except Exception: return False def __ne__(self, other: object) -> bool: diff --git a/bemani/sniff/__init__.py b/bemani/sniff/__init__.py index 8f90993..91b8f4d 100644 --- a/bemani/sniff/__init__.py +++ b/bemani/sniff/__init__.py @@ -1 +1,6 @@ from bemani.sniff.sniff import Sniffer + + +__all__ = [ + "Sniffer", +] diff --git a/bemani/utils/bemanishark.py b/bemani/utils/bemanishark.py index 682b08c..da78f4f 100644 --- a/bemani/utils/bemanishark.py +++ b/bemani/utils/bemanishark.py @@ -35,7 +35,7 @@ def mainloop(address: Optional[str]=None, port: int=80, verbose: bool=False) -> inbound['headers'].get('x-eamuse-info'), inbound['data'] ) - except EAmuseException as e: + except EAmuseException: in_req = None print("Inbound request (from {}:{} to {}:{}):".format( @@ -63,7 +63,7 @@ def mainloop(address: Optional[str]=None, port: int=80, verbose: bool=False) -> outbound['headers'].get('x-eamuse-info'), outbound['data'] ) - except EAmuseException as e: + except EAmuseException: out_req = None print("Outbound response (from {}:{} to {}:{}):".format( diff --git a/requirements.txt b/requirements.txt index 778f71f..6960f49 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ Requests mysqlclient passlib mypy -flake8==3.5.0 +flake8 typed-ast SQLAlchemy alembic diff --git a/verifylint b/verifylint index 97798a1..05c13a4 100755 --- a/verifylint +++ b/verifylint @@ -1,3 +1,3 @@ #! /bin/bash -flake8 bemani/ --ignore E501 | grep -v "migrations\/" | grep -v "__init__.*F401" +flake8 bemani/ --ignore E501,E252,W504 | grep -v "migrations\/" diff --git a/verifytyping b/verifytyping index 6432674..6812b39 100755 --- a/verifytyping +++ b/verifytyping @@ -30,11 +30,9 @@ do cmdline+=("bemani.utils.$project") done -echo "Verifying type information..." MYPYPATH=$(python -c "import os; print(os.path.realpath('.'))") mypy \ "${cmdline[@]}" \ --warn-redundant-casts \ --disallow-untyped-calls \ --disallow-untyped-defs \ --no-strict-optional -echo "Done!"