From e6cfd334355cec0b3faaa5f606b07839b58dada3 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 7 Nov 2019 18:35:14 +0300 Subject: [PATCH] Fix #2076 - use collection ABCs from .abc module --- eos/modifiedAttributeDict.py | 5 +++-- service/port/esi.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/eos/modifiedAttributeDict.py b/eos/modifiedAttributeDict.py index 7be24ff76..0a9eda8a4 100644 --- a/eos/modifiedAttributeDict.py +++ b/eos/modifiedAttributeDict.py @@ -17,7 +17,8 @@ # along with eos. If not, see . # =============================================================================== -import collections + +from collections import MutableMapping from copy import copy from math import exp @@ -96,7 +97,7 @@ class ChargeAttrShortcut: return return_value or default -class ModifiedAttributeDict(collections.MutableMapping): +class ModifiedAttributeDict(MutableMapping): overrides_enabled = False class CalculationPlaceholder: diff --git a/service/port/esi.py b/service/port/esi.py index 7b1e35954..c9296e1ec 100644 --- a/service/port/esi.py +++ b/service/port/esi.py @@ -18,8 +18,8 @@ # ============================================================================= -import collections import json +from collections import defaultdict from logbook import Logger @@ -61,7 +61,7 @@ def exportESI(ofit, callback): # max fit name length is 50 characters # Most keys are created simply because they are required, but bogus data is okay - nested_dict = lambda: collections.defaultdict(nested_dict) + nested_dict = lambda: defaultdict(nested_dict) fit = nested_dict() sFit = svcFit.getInstance()