Resolve conflict

.pylintrc

@@ -1,10 +1,10 @@
 [MASTER]
-extension-pkg-whitelist=numpy,talib
+extension-pkg-whitelist=numpy,talib,talib.abstract
 
 [BASIC]
 good-names=logger
 ignore=vendor
 
 [TYPECHECK]
-ignored-modules=numpy,talib
+ignored-modules=numpy,talib,talib.abstract
 

freqtrade/analyze.py

@@ -4,14 +4,14 @@ Functions to analyze ticker data with indicators and produce buy and sell signal
 import logging
 from datetime import timedelta
 from enum import Enum
-from typing import List, Dict
+from typing import Dict, List
 
 import arrow
 import talib.abstract as ta
 from pandas import DataFrame, to_datetime
 
-from freqtrade.exchange import get_ticker_history
 import freqtrade.vendor.qtpylib.indicators as qtpylib
+from freqtrade.exchange import get_ticker_history
 
 logger = logging.getLogger(__name__)
 

freqtrade/exchange/bittrex.py

@@ -1,8 +1,9 @@
 import logging
 import requests
-from typing import List, Dict, Optional
+from typing import Dict, List, Optional
 
-from bittrex.bittrex import Bittrex as _Bittrex, API_V2_0, API_V1_1
+from bittrex.bittrex import Bittrex as _Bittrex
+from bittrex.bittrex import API_V1_1, API_V2_0
 from requests.exceptions import ContentDecodingError
 
 from freqtrade import OperationalException

freqtrade/exchange/interface.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import List, Dict, Optional
+from typing import Dict, List, Optional
 
 
 class Exchange(ABC):

freqtrade/fiat_convert.py

@@ -1,5 +1,6 @@
 import logging
 import time
+
 from pymarketcap import Pymarketcap
 
 logger = logging.getLogger(__name__)

freqtrade/main.py

@@ -5,20 +5,20 @@ import logging
 import sys
 import time
 import traceback
-import arrow
 from datetime import datetime
-from typing import Dict, Optional, List
+from typing import Dict, List, Optional
 
+import arrow
 import requests
 from cachetools import cached, TTLCache
 
-from freqtrade import __version__, exchange, persistence, rpc, DependencyException, \
-    OperationalException
-from freqtrade.analyze import get_signal, SignalType
-from freqtrade.misc import State, get_state, update_state, parse_args, throttle, \
-    load_config
-from freqtrade.persistence import Trade
+from freqtrade import (DependencyException, OperationalException, __version__,
+                       exchange, persistence, rpc)
+from freqtrade.analyze import SignalType, get_signal
 from freqtrade.fiat_convert import CryptoToFiatConverter
+from freqtrade.misc import (State, get_state, load_config, parse_args,
+                            throttle, update_state)
+from freqtrade.persistence import Trade
 
 logger = logging.getLogger('freqtrade')
 

freqtrade/misc.py

@@ -3,10 +3,10 @@ import enum
 import json
 import logging
 import time
-from typing import Any, Callable, List, Dict
+from typing import Any, Callable, Dict, List
 
-from jsonschema import validate, Draft4Validator
-from jsonschema.exceptions import best_match, ValidationError
+from jsonschema import Draft4Validator, validate
+from jsonschema.exceptions import ValidationError, best_match
 from wrapt import synchronized
 
 from freqtrade import __version__
@@ -57,8 +57,8 @@ def load_config(path: str) -> Dict:
     try:
         validate(conf, CONF_SCHEMA)
         return conf
-    except ValidationError as ex:
-        logger.fatal('Invalid configuration. See config.json.example. Reason: %s', ex)
+    except ValidationError as exception:
+        logger.fatal('Invalid configuration. See config.json.example. Reason: %s', exception)
         raise ValidationError(
             best_match(Draft4Validator(CONF_SCHEMA).iter_errors(conf)).message
         )
@@ -81,7 +81,7 @@ def throttle(func: Callable[..., Any], min_secs: float, *args, **kwargs) -> Any:
     return result
 
 
-def parse_args_common(args: List[str], description: str):
+def common_args_parser(description: str):
     """
     Parses given common arguments and returns them as a parsed object.
     """
@@ -117,11 +117,11 @@ def parse_args(args: List[str], description: str):
     Parses given arguments and returns an argparse Namespace instance.
     Returns None if a sub command has been selected and executed.
     """
-    parser = parse_args_common(args, description)
+    parser = common_args_parser(description)
     parser.add_argument(
         '--dry-run-db',
-        help='Force dry run to use a local DB "tradesv3.dry_run.sqlite" instead of memory DB. Work only if dry_run is \
-             enabled.',  # noqa
+        help='Force dry run to use a local DB "tradesv3.dry_run.sqlite" \
+             instead of memory DB. Work only if dry_run is enabled.',
         action='store_true',
         dest='dry_run_db',
     )
@@ -135,7 +135,8 @@ def parse_args(args: List[str], description: str):
     )
     parser.add_argument(
         '--dynamic-whitelist',
-        help='dynamically generate and update whitelist based on 24h BaseVolume (Default 20 currencies)',  # noqa
+        help='dynamically generate and update whitelist \
+             based on 24h BaseVolume (Default 20 currencies)',  # noqa
         dest='dynamic_whitelist',
         const=20,
         type=int,

freqtrade/optimize/backtesting.py

@@ -1,20 +1,19 @@
 # pragma pylint: disable=missing-docstring,W0212
 
-
 import logging
-from typing import Tuple, Dict
+from typing import Dict, Tuple
 
 import arrow
 from pandas import DataFrame, Series
 from tabulate import tabulate
 
+import freqtrade.misc as misc
+import freqtrade.optimize as optimize
 from freqtrade import exchange
 from freqtrade.analyze import populate_buy_trend, populate_sell_trend
 from freqtrade.exchange import Bittrex
 from freqtrade.main import min_roi_reached
-import freqtrade.misc as misc
 from freqtrade.optimize import preprocess
-import freqtrade.optimize as optimize
 from freqtrade.persistence import Trade
 
 logger = logging.getLogger(__name__)

freqtrade/optimize/hyperopt.py

@@ -11,10 +11,11 @@ from functools import reduce
 from math import exp
 from operator import itemgetter
 
-from hyperopt import fmin, tpe, hp, Trials, STATUS_OK, STATUS_FAIL, space_eval
+from hyperopt import STATUS_FAIL, STATUS_OK, Trials, fmin, hp, space_eval, tpe
 from hyperopt.mongoexp import MongoTrials
 from pandas import DataFrame
 
+from freqtrade import main  # noqa
 from freqtrade import exchange, optimize
 from freqtrade.exchange import Bittrex
 from freqtrade.misc import load_config

freqtrade/persistence.py

@@ -1,10 +1,11 @@
 import logging
 from datetime import datetime
 from decimal import Decimal, getcontext
-from typing import Optional, Dict
+from typing import Dict, Optional
 
 import arrow
-from sqlalchemy import Boolean, Column, DateTime, Float, Integer, String, create_engine
+from sqlalchemy import (Boolean, Column, DateTime, Float, Integer, String,
+                        create_engine)
 from sqlalchemy.engine import Engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm.scoping import scoped_session

freqtrade/rpc/telegram.py

@@ -1,21 +1,21 @@
 import logging
 import re
+from datetime import datetime, timedelta
 from decimal import Decimal
-from datetime import timedelta, datetime
-from typing import Callable, Any
+from typing import Any, Callable
 
 import arrow
 from pandas import DataFrame
 from sqlalchemy import and_, func, text
 from tabulate import tabulate
-from telegram import ParseMode, Bot, Update, ReplyKeyboardMarkup
+from telegram import Bot, ParseMode, ReplyKeyboardMarkup, Update
 from telegram.error import NetworkError, TelegramError
 from telegram.ext import CommandHandler, Updater
 
-from freqtrade import exchange, __version__
-from freqtrade.misc import get_state, State, update_state
-from freqtrade.persistence import Trade
+from freqtrade import __version__, exchange
 from freqtrade.fiat_convert import CryptoToFiatConverter
+from freqtrade.misc import State, get_state, update_state
+from freqtrade.persistence import Trade
 
 # Remove noisy log messages
 logging.getLogger('requests.packages.urllib3').setLevel(logging.INFO)

freqtrade/tests/conftest.py

@@ -2,10 +2,10 @@
 from datetime import datetime
 from unittest.mock import MagicMock
 
-import pytest
 import arrow
+import pytest
 from jsonschema import validate
-from telegram import Message, Chat, Update
+from telegram import Chat, Message, Update
 
 from freqtrade.misc import CONF_SCHEMA
 

freqtrade/tests/exchange/test_exchange_bittrex.py

@@ -32,7 +32,7 @@ def _stub_config():
             'secret': ''}
 
 
-class Fake_bittrex():
+class FakeBittrex():
     def __init__(self, success=True):
         self.success = True  # Believe in yourself
         self.result = None
@@ -145,7 +145,7 @@ def test_exchange_bittrex_fee():
 
 def test_exchange_bittrex_buy_good(mocker):
     wb = make_wrap_bittrex()
-    fb = Fake_bittrex()
+    fb = FakeBittrex()
     uuid = wb.buy('BTC_ETH', 1, 1)
     assert uuid == fb.fake_buysell_limit(1, 2, 3)['result']['uuid']
 
@@ -156,7 +156,7 @@ def test_exchange_bittrex_buy_good(mocker):
 
 def test_exchange_bittrex_sell_good(mocker):
     wb = make_wrap_bittrex()
-    fb = Fake_bittrex()
+    fb = FakeBittrex()
     uuid = wb.sell('BTC_ETH', 1, 1)
     assert uuid == fb.fake_buysell_limit(1, 2, 3)['result']['uuid']
 
@@ -167,7 +167,7 @@ def test_exchange_bittrex_sell_good(mocker):
 
 def test_exchange_bittrex_get_balance(mocker):
     wb = make_wrap_bittrex()
-    fb = Fake_bittrex()
+    fb = FakeBittrex()
     bal = wb.get_balance('BTC_ETH')
     assert bal == fb.fake_get_balance(1)['result']['Balance']
 
@@ -178,7 +178,7 @@ def test_exchange_bittrex_get_balance(mocker):
 
 def test_exchange_bittrex_get_balances():
     wb = make_wrap_bittrex()
-    fb = Fake_bittrex()
+    fb = FakeBittrex()
     bals = wb.get_balances()
     assert bals == fb.fake_get_balances()['result']
 
@@ -189,7 +189,7 @@ def test_exchange_bittrex_get_balances():
 
 def test_exchange_bittrex_get_ticker():
     wb = make_wrap_bittrex()
-    fb = Fake_bittrex()
+    fb = FakeBittrex()
 
     # Poll ticker, which updates the cache
     tick = wb.get_ticker('BTC_ETH')
@@ -210,7 +210,7 @@ def test_exchange_bittrex_get_ticker():
 
 def test_exchange_bittrex_get_ticker_bad():
     wb = make_wrap_bittrex()
-    fb = Fake_bittrex()
+    fb = FakeBittrex()
     fb.result = {'success': True,
                  'result': {'Bid': 1}}  # incomplete result
     with pytest.raises(ContentDecodingError, match=r'.*Got invalid response from bittrex params.*'):
@@ -222,15 +222,15 @@ def test_exchange_bittrex_get_ticker_bad():
         wb.get_ticker('BTC_ETH')
 
 
-def test_exchange_bittrex_get_ticker_historyOne():
+def test_exchange_bittrex_get_ticker_history_one():
     wb = make_wrap_bittrex()
-    Fake_bittrex()
+    FakeBittrex()
     assert wb.get_ticker_history('BTC_ETH', 1)
 
 
 def test_exchange_bittrex_get_ticker_history():
     wb = make_wrap_bittrex()
-    fb = Fake_bittrex()
+    fb = FakeBittrex()
     assert wb.get_ticker_history('BTC_ETH', 5)
     with pytest.raises(ValueError, match=r'.*Cannot parse tick_interval.*'):
         wb.get_ticker_history('BTC_ETH', 2)
@@ -253,7 +253,7 @@ def test_exchange_bittrex_get_ticker_history():
 
 def test_exchange_bittrex_get_order():
     wb = make_wrap_bittrex()
-    fb = Fake_bittrex()
+    fb = FakeBittrex()
     order = wb.get_order('someUUID')
     assert order['id'] == 'ABC123'
     fb.success = False
@@ -263,7 +263,7 @@ def test_exchange_bittrex_get_order():
 
 def test_exchange_bittrex_cancel_order():
     wb = make_wrap_bittrex()
-    fb = Fake_bittrex()
+    fb = FakeBittrex()
     wb.cancel_order('someUUID')
     with pytest.raises(btx.OperationalException, match=r'no such order'):
         fb.success = False
@@ -284,7 +284,7 @@ def test_exchange_get_pair_detail_url():
 
 def test_exchange_get_markets():
     wb = make_wrap_bittrex()
-    fb = Fake_bittrex()
+    fb = FakeBittrex()
     x = wb.get_markets()
     assert x == ['__']
     with pytest.raises(btx.OperationalException, match=r'market gone'):
@@ -294,7 +294,7 @@ def test_exchange_get_markets():
 
 def test_exchange_get_market_summaries():
     wb = make_wrap_bittrex()
-    fb = Fake_bittrex()
+    fb = FakeBittrex()
     assert ['sum'] == wb.get_market_summaries()
     with pytest.raises(btx.OperationalException, match=r'no summary'):
         fb.success = False
@@ -303,7 +303,7 @@ def test_exchange_get_market_summaries():
 
 def test_exchange_get_wallet_health():
     wb = make_wrap_bittrex()
-    fb = Fake_bittrex()
+    fb = FakeBittrex()
     x = wb.get_wallet_health()
     assert x[0]['Currency'] == 'BTC_ETH'
     with pytest.raises(btx.OperationalException, match=r'bad health'):

freqtrade/tests/test_acl_pair.py

@@ -7,17 +7,17 @@ from freqtrade.main import refresh_whitelist, gen_pair_whitelist
 
 def whitelist_conf():
     return {
-        "stake_currency": "BTC",
-        "exchange": {
-            "pair_whitelist": [
-                "BTC_ETH",
-                "BTC_TKN",
-                "BTC_TRST",
-                "BTC_SWT",
-                "BTC_BCC"
+        'stake_currency': 'BTC',
+        'exchange': {
+            'pair_whitelist': [
+                'BTC_ETH',
+                'BTC_TKN',
+                'BTC_TRST',
+                'BTC_SWT',
+                'BTC_BCC'
             ],
-            "pair_blacklist": [
-                "BTC_BLK"
+            'pair_blacklist': [
+                'BTC_BLK'
             ],
         },
     }
@@ -25,52 +25,51 @@ def whitelist_conf():
 
 def get_market_summaries():
     return [{
-         "MarketName": "BTC-TKN",
-         "High": 0.00000919,
-         "Low": 0.00000820,
-         "Volume": 74339.61396015,
-         "Last": 0.00000820,
-         "BaseVolume": 1664,
-         "TimeStamp": "2014-07-09T07:19:30.15",
-         "Bid": 0.00000820,
-         "Ask": 0.00000831,
-         "OpenBuyOrders": 15,
-         "OpenSellOrders": 15,
-         "PrevDay": 0.00000821,
-         "Created": "2014-03-20T06:00:00",
-         "DisplayMarketName": ""
+        'MarketName': 'BTC-TKN',
+        'High': 0.00000919,
+        'Low': 0.00000820,
+        'Volume': 74339.61396015,
+        'Last': 0.00000820,
+        'BaseVolume': 1664,
+        'TimeStamp': '2014-07-09T07:19:30.15',
+        'Bid': 0.00000820,
+        'Ask': 0.00000831,
+        'OpenBuyOrders': 15,
+        'OpenSellOrders': 15,
+        'PrevDay': 0.00000821,
+        'Created': '2014-03-20T06:00:00',
+        'DisplayMarketName': ''
     }, {
-         "MarketName": "BTC-ETH",
-         "High": 0.00000072,
-         "Low": 0.00000001,
-         "Volume": 166340678.42280999,
-         "Last": 0.00000005,
-         "BaseVolume": 42,
-         "TimeStamp": "2014-07-09T07:21:40.51",
-         "Bid": 0.00000004,
-         "Ask": 0.00000005,
-         "OpenBuyOrders": 18,
-         "OpenSellOrders": 18,
-         "PrevDay": 0.00000002,
-         "Created": "2014-05-30T07:57:49.637",
-         "DisplayMarketName": ""
+        'MarketName': 'BTC-ETH',
+        'High': 0.00000072,
+        'Low': 0.00000001,
+        'Volume': 166340678.42280999,
+        'Last': 0.00000005,
+        'BaseVolume': 42,
+        'TimeStamp': '2014-07-09T07:21:40.51',
+        'Bid': 0.00000004,
+        'Ask': 0.00000005,
+        'OpenBuyOrders': 18,
+        'OpenSellOrders': 18,
+        'PrevDay': 0.00000002,
+        'Created': '2014-05-30T07:57:49.637',
+        'DisplayMarketName': ''
     }, {
-         "MarketName": "BTC-BLK",
-         "High": 0.00000072,
-         "Low": 0.00000001,
-         "Volume": 166340678.42280999,
-         "Last": 0.00000005,
-         "BaseVolume": 3,
-         "TimeStamp": "2014-07-09T07:21:40.51",
-         "Bid": 0.00000004,
-         "Ask": 0.00000005,
-         "OpenBuyOrders": 18,
-         "OpenSellOrders": 18,
-         "PrevDay": 0.00000002,
-         "Created": "2014-05-30T07:57:49.637",
-         "DisplayMarketName": ""
-      }
-    ]
+        'MarketName': 'BTC-BLK',
+        'High': 0.00000072,
+        'Low': 0.00000001,
+        'Volume': 166340678.42280999,
+        'Last': 0.00000005,
+        'BaseVolume': 3,
+        'TimeStamp': '2014-07-09T07:21:40.51',
+        'Bid': 0.00000004,
+        'Ask': 0.00000005,
+        'OpenBuyOrders': 18,
+        'OpenSellOrders': 18,
+        'PrevDay': 0.00000002,
+        'Created': '2014-05-30T07:57:49.637',
+        'DisplayMarketName': ''
+    }]
 
 
 def get_health():
@@ -95,7 +94,8 @@ def test_refresh_market_pair_not_in_whitelist(mocker):
     mocker.patch.dict('freqtrade.main._CONF', conf)
     mocker.patch.multiple('freqtrade.main.exchange',
                           get_wallet_health=get_health)
-    refreshedwhitelist = refresh_whitelist(conf['exchange']['pair_whitelist'] + ['BTC_XXX'])
+    refreshedwhitelist = refresh_whitelist(
+        conf['exchange']['pair_whitelist'] + ['BTC_XXX'])
     # List ordered by BaseVolume
     whitelist = ['BTC_ETH', 'BTC_TKN']
     # Ensure all except those in whitelist are removed
@@ -123,7 +123,8 @@ def test_refresh_whitelist_dynamic(mocker):
                           get_market_summaries=get_market_summaries)
     # argument: use the whitelist dynamically by exchange-volume
     whitelist = ['BTC_TKN', 'BTC_ETH']
-    refreshedwhitelist = refresh_whitelist(gen_pair_whitelist(conf['stake_currency']))
+    refreshedwhitelist = refresh_whitelist(
+        gen_pair_whitelist(conf['stake_currency']))
     assert whitelist == refreshedwhitelist
 
 

freqtrade/tests/test_analyze.py

@@ -6,8 +6,9 @@ import arrow
 import pytest
 from pandas import DataFrame
 
-from freqtrade.analyze import parse_ticker_dataframe, populate_buy_trend, populate_indicators, \
-    get_signal, SignalType, populate_sell_trend
+from freqtrade.analyze import (SignalType, get_signal, parse_ticker_dataframe,
+                               populate_buy_trend, populate_indicators,
+                               populate_sell_trend)
 
 
 @pytest.fixture

freqtrade/tests/test_dataframe.py

@@ -1,7 +1,7 @@
 import pandas
 
-from freqtrade import analyze
 import freqtrade.optimize
+from freqtrade import analyze
 
 _pairs = ['BTC_ETH']
 

freqtrade/tests/test_fiat_convert.py

@@ -1,10 +1,11 @@
 # pragma pylint: disable=missing-docstring, too-many-arguments, too-many-ancestors, C0103
 
 import time
-import pytest
 from unittest.mock import MagicMock
 
-from freqtrade.fiat_convert import CryptoToFiatConverter, CryptoFiat
+import pytest
+
+from freqtrade.fiat_convert import CryptoFiat, CryptoToFiatConverter
 
 
 def test_pair_convertion_object():

freqtrade/tests/test_main.py

@@ -1,28 +1,27 @@
 # pragma pylint: disable=missing-docstring,C0103
 import copy
+import logging
 from unittest.mock import MagicMock
 
+import arrow
 import pytest
 import requests
-import logging
-import arrow
 from sqlalchemy import create_engine
 
+import freqtrade.main as main
 from freqtrade import DependencyException, OperationalException
 from freqtrade.analyze import SignalType
 from freqtrade.exchange import Exchanges
-from freqtrade.main import create_trade, handle_trade, init, \
-    get_target_bid, _process, execute_sell, check_handle_timedout
-from freqtrade.misc import get_state, State
+from freqtrade.main import (_process, check_handle_timedout, create_trade,
+                            execute_sell, get_target_bid, handle_trade, init)
+from freqtrade.misc import State, get_state
 from freqtrade.persistence import Trade
-import freqtrade.main as main
 
 
-# Test that main() can start backtesting or hyperopt.
-# and also ensure we can pass some specific arguments
-# argument parsing is done in test_misc.py
-
 def test_parse_args_backtesting(mocker):
+    """ Test that main() can start backtesting or hyperopt.
+        and also ensure we can pass some specific arguments
+        argument parsing is done in test_misc.py """
     backtesting_mock = mocker.patch(
         'freqtrade.optimize.backtesting.start', MagicMock())
     with pytest.raises(SystemExit, match=r'0'):
@@ -269,7 +268,7 @@ def test_handle_trade(default_conf, limit_buy_order, limit_sell_order, mocker):
     assert trade.close_date is not None
 
 
-def test_handle_trade_roi(default_conf, ticker, limit_buy_order, mocker, caplog):
+def test_handle_trade_roi(default_conf, ticker, mocker, caplog):
     default_conf.update({'experimental': {'use_sell_signal': True}})
     mocker.patch.dict('freqtrade.main._CONF', default_conf)
 
@@ -301,7 +300,7 @@ def test_handle_trade_roi(default_conf, ticker, limit_buy_order, mocker, caplog)
     assert ('freqtrade', logging.DEBUG, 'Executing sell due to ROI ...') in caplog.record_tuples
 
 
-def test_handle_trade_experimental(default_conf, ticker, limit_buy_order, mocker, caplog):
+def test_handle_trade_experimental(default_conf, ticker, mocker, caplog):
     default_conf.update({'experimental': {'use_sell_signal': True}})
     mocker.patch.dict('freqtrade.main._CONF', default_conf)
 
@@ -353,7 +352,7 @@ def test_close_trade(default_conf, ticker, limit_buy_order, limit_sell_order, mo
         handle_trade(trade)
 
 
-def test_check_handle_timedout_buy(default_conf, ticker, health, limit_buy_order_old, mocker):
+def test_check_handle_timedout_buy(default_conf, ticker, limit_buy_order_old, mocker):
     mocker.patch.dict('freqtrade.main._CONF', default_conf)
     cancel_order_mock = MagicMock()
     mocker.patch.multiple('freqtrade.rpc', init=MagicMock(), send_msg=MagicMock())
@@ -385,7 +384,7 @@ def test_check_handle_timedout_buy(default_conf, ticker, health, limit_buy_order
     assert len(trades) == 0
 
 
-def test_check_handle_timedout_sell(default_conf, ticker, health, limit_sell_order_old, mocker):
+def test_check_handle_timedout_sell(default_conf, ticker, limit_sell_order_old, mocker):
     mocker.patch.dict('freqtrade.main._CONF', default_conf)
     cancel_order_mock = MagicMock()
     mocker.patch.multiple('freqtrade.rpc', init=MagicMock(), send_msg=MagicMock())
@@ -418,7 +417,7 @@ def test_check_handle_timedout_sell(default_conf, ticker, health, limit_sell_ord
 
 
 def test_check_handle_timedout_partial(default_conf, ticker, limit_buy_order_old_partial,
-                                       health, mocker):
+                                       mocker):
     mocker.patch.dict('freqtrade.main._CONF', default_conf)
     cancel_order_mock = MagicMock()
     mocker.patch.multiple('freqtrade.rpc', init=MagicMock(), send_msg=MagicMock())

freqtrade/tests/test_misc.py

@@ -1,14 +1,14 @@
 # pragma pylint: disable=missing-docstring,C0103
+import argparse
 import json
 import time
-import argparse
 from copy import deepcopy
 
 import pytest
 from jsonschema import ValidationError
 
-from freqtrade.misc import throttle, parse_args, load_config,\
-     parse_args_common
+from freqtrade.misc import (common_args_parser, load_config, parse_args,
+                            throttle)
 
 
 def test_throttle():
@@ -39,12 +39,10 @@ def test_throttle_with_assets():
     assert result == -1
 
 
-# Parse common command-line-arguments
-# used for all tools
-
+# Parse common command-line-arguments. Used for all tools
 
 def test_parse_args_none():
-    args = parse_args_common([], '')
+    args = common_args_parser('')
     assert isinstance(args, argparse.ArgumentParser)
 
 
@@ -87,12 +85,12 @@ def test_parse_args_invalid():
 
 def test_parse_args_dynamic_whitelist():
     args = parse_args(['--dynamic-whitelist'], '')
-    assert args.dynamic_whitelist is 20
+    assert args.dynamic_whitelist == 20
 
 
 def test_parse_args_dynamic_whitelist_10():
     args = parse_args(['--dynamic-whitelist', '10'], '')
-    assert args.dynamic_whitelist is 10
+    assert args.dynamic_whitelist == 10
 
 
 def test_parse_args_dynamic_whitelist_invalid_values():

freqtrade/tests/test_persistence.py

@@ -1,9 +1,10 @@
 # pragma pylint: disable=missing-docstring
+import os
+
 import pytest
 
-import os
 from freqtrade.exchange import Exchanges
-from freqtrade.persistence import init, Trade
+from freqtrade.persistence import Trade, init
 
 
 def test_init_create_session(default_conf, mocker):

scripts/plot_dataframe.py

@@ -6,11 +6,11 @@ import matplotlib  # Install PYQT5 manually if you want to test this helper func
 matplotlib.use("Qt5Agg")
 import matplotlib.pyplot as plt
 from freqtrade import exchange, analyze
-from freqtrade.misc import parse_args_common
+from freqtrade.misc import common_args_parser
 
 
 def plot_parse_args(args ):
-    parser = parse_args_common(args, 'Graph utility')
+    parser = common_args_parser(args, 'Graph utility')
     parser.add_argument(
         '-p', '--pair',
         help = 'What currency pair',