From 29a39a258a1561b06ce4008d1ef9808e39149c51 Mon Sep 17 00:00:00 2001 From: nanoric Date: Mon, 9 Sep 2019 10:59:34 +0800 Subject: [PATCH] [Mod] make flake8 happy --- vnpy/gateway/bybit/bybit_gateway.py | 22 +++++++++++----------- vnpy/gateway/bybit/common.py | 4 ++-- vnpy/gateway/bybit/websocket_api.py | 10 +++------- vnpy/trader/constant.py | 1 + 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/vnpy/gateway/bybit/bybit_gateway.py b/vnpy/gateway/bybit/bybit_gateway.py index ae05784b..9b3d980c 100644 --- a/vnpy/gateway/bybit/bybit_gateway.py +++ b/vnpy/gateway/bybit/bybit_gateway.py @@ -1,19 +1,19 @@ """""" from dataclasses import dataclass from datetime import datetime -from typing import Dict, List, Any, Tuple +from typing import Any, Dict, List, Tuple from vnpy.event import Event from vnpy.gateway.bybit.rest_api import BybitRestApi, HistoryDataNextInfo from vnpy.gateway.bybit.websocket_api import BybitWebsocketApi -from vnpy.trader.constant import (Exchange, OrderType, Interval) +from vnpy.trader.constant import (Exchange, Interval, OrderType) from vnpy.trader.event import EVENT_TIMER from vnpy.trader.gateway import BaseGateway -from vnpy.trader.object import (CancelRequest, HistoryRequest, OrderData, OrderRequest, - PositionData, SubscribeRequest, TickData, BarData) -from .common import DIRECTION_BYBIT2VT, OPPOSITE_DIRECTION, ORDER_TYPE_BYBIT2VT, \ - STOP_ORDER_STATUS_BYBIT2VT, parse_datetime, STATUS_BYBIT2VT, INTERVAL_VT2BYBIT, local_tz, \ - utc_tz, INTERVAL_VT2BYBIT_INT +from vnpy.trader.object import (BarData, CancelRequest, HistoryRequest, OrderData, OrderRequest, + PositionData, SubscribeRequest, TickData) +from .common import (DIRECTION_BYBIT2VT, INTERVAL_VT2BYBIT_INT, OPPOSITE_DIRECTION, + ORDER_TYPE_BYBIT2VT, STATUS_BYBIT2VT, STOP_ORDER_STATUS_BYBIT2VT, local_tz, + parse_datetime, utc_tz) @dataclass() @@ -97,10 +97,10 @@ class BybitGateway(BaseGateway): self.rest_api.query_position() def query_first_history(self, - symbol: str, - interval: Interval, - start: datetime, - ) -> Tuple[List[BarData], "HistoryDataNextInfo"]: + symbol: str, + interval: Interval, + start: datetime, + ) -> Tuple[List[BarData], "HistoryDataNextInfo"]: # datetime for a bar is close_time # we got open_time from API. diff --git a/vnpy/gateway/bybit/common.py b/vnpy/gateway/bybit/common.py index f525cd89..7d9acc17 100644 --- a/vnpy/gateway/bybit/common.py +++ b/vnpy/gateway/bybit/common.py @@ -49,8 +49,8 @@ INTERVAL_VT2BYBIT = { INTERVAL_VT2BYBIT_INT = { Interval.MINUTE: 1, Interval.HOUR: 60, - Interval.DAILY: 60*24, - Interval.WEEKLY: 60*24*7, + Interval.DAILY: 60 * 24, + Interval.WEEKLY: 60 * 24 * 7, } TIMEDELTA_MAP = { Interval.MINUTE: timedelta(minutes=1), diff --git a/vnpy/gateway/bybit/websocket_api.py b/vnpy/gateway/bybit/websocket_api.py index 85a5a096..c66c7da0 100644 --- a/vnpy/gateway/bybit/websocket_api.py +++ b/vnpy/gateway/bybit/websocket_api.py @@ -10,11 +10,9 @@ from typing import Any, Callable, Dict, TYPE_CHECKING from sortedcontainers import SortedSet from vnpy.api.websocket import WebsocketClient -from vnpy.trader.constant import Direction, Exchange, Product, OrderType -from vnpy.trader.object import AccountData, ContractData, PositionData, SubscribeRequest, \ - TickData, TradeData -from .common import (DIRECTION_BYBIT2VT, generate_timestamp, - sign, local_tz, utc_tz, parse_datetime) +from vnpy.trader.constant import (Exchange, Product) +from vnpy.trader.object import (AccountData, ContractData, SubscribeRequest, TickData, TradeData) +from .common import (DIRECTION_BYBIT2VT, generate_timestamp, local_tz, parse_datetime, sign, utc_tz) if TYPE_CHECKING: from vnpy.gateway.bybit import BybitGateway @@ -115,7 +113,6 @@ class BybitWebsocketApi(WebsocketClient): def on_packet(self, packet: dict): """""" - processed = False success = packet.get('success', None) topic = packet.get('topic', None) if success is not None: @@ -338,7 +335,6 @@ class BybitWebsocketApi(WebsocketClient): def _ping(self): super()._ping() - ws = self._ws self.send_packet({'op': 'ping'}) diff --git a/vnpy/trader/constant.py b/vnpy/trader/constant.py index 8aef1008..714e86e4 100644 --- a/vnpy/trader/constant.py +++ b/vnpy/trader/constant.py @@ -118,6 +118,7 @@ class Exchange(Enum): BYBIT = "BYBIT" # bybit.com COINBASE = "COINBASE" + class Currency(Enum): """ Currency.