Merge branch 'develop' into money_mgt

2018-09-27 14:54:18 +02:00
parent 21f5a94eca 89b515be60
commit d6415f3499
11 changed files with 77 additions and 33 deletions
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -10,7 +10,7 @@ from datetime import datetime
 from typing import Any, Callable, Dict, List, Optional

 import arrow
-import requests
+from requests.exceptions import RequestException

 from cachetools import TTLCache, cached

@@ -667,7 +667,7 @@ class FreqtradeBot(object):
                if not trade.open_order_id:
                    continue
                order = self.exchange.get_order(trade.open_order_id, trade.pair)
-            except requests.exceptions.RequestException:
+            except (RequestException, DependencyException):
                logger.info(
                    'Cannot query order for %s due to %s',
                    trade,