From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=jaben.carsey@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 390EE2194D3B3 for ; Thu, 24 Jan 2019 08:14:26 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jan 2019 08:14:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,517,1539673200"; d="scan'208";a="121005831" Received: from jcarsey-desk1.amr.corp.intel.com ([10.7.159.149]) by orsmga003.jf.intel.com with ESMTP; 24 Jan 2019 08:14:24 -0800 From: Jaben Carsey To: edk2-devel@lists.01.org Cc: Bob Feng , Liming Gao Date: Thu, 24 Jan 2019 08:14:20 -0800 Message-Id: X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: References: In-Reply-To: References: Subject: [Patch v1 3/4] BaseTools/Common/Misc: Cleanup the imports X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 X-List-Received-Date: Thu, 24 Jan 2019 16:14:26 -0000 Refactor to 'dict' from 'IterableUserDict' which was only required for old python interpreter. Sort imports according to PEP8 Remove those we dont need. Cc: Bob Feng Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jaben Carsey --- BaseTools/Source/Python/Common/Misc.py | 34 ++++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py index 65ccba36b2e9..e8be8f866511 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -15,7 +15,7 @@ # Import Modules # from __future__ import absolute_import -import Common.LongFilePathOs as os + import sys import string import threading @@ -26,22 +26,22 @@ import array import shutil from random import sample from struct import pack -from UserDict import IterableUserDict -from UserList import UserList +import uuid +import subprocess +from collections import OrderedDict +import Common.LongFilePathOs as os from Common import EdkLogger as EdkLogger from Common import GlobalData as GlobalData -from .DataType import * -from .BuildToolError import * +from Common.DataType import * +from Common.BuildToolError import * from CommonDataClass.DataClass import * -from .Parsing import GetSplitValueList +from Common.Parsing import GetSplitValueList from Common.LongFilePathSupport import OpenLongFilePath as open from Common.MultipleWorkspace import MultipleWorkspace as mws -import uuid from CommonDataClass.Exceptions import BadExpression from Common.caching import cached_property -import subprocess -from collections import OrderedDict + ## Regular expression used to find out place holders in string template gPlaceholderPattern = re.compile("\$\{([^$()\s]+)\}", re.MULTILINE | re.UNICODE) @@ -831,22 +831,22 @@ class Progressor: # accessed in the order they are added into the dict. It guarantees the order # by making use of an internal list to keep a copy of keys. # -class sdict(IterableUserDict): +class sdict(dict): ## Constructor def __init__(self): - IterableUserDict.__init__(self) + dict.__init__(self) self._key_list = [] ## [] operator def __setitem__(self, key, value): if key not in self._key_list: self._key_list.append(key) - IterableUserDict.__setitem__(self, key, value) + dict.__setitem__(self, key, value) ## del operator def __delitem__(self, key): self._key_list.remove(key) - IterableUserDict.__delitem__(self, key) + dict.__delitem__(self, key) ## used in "for k in dict" loop to ensure the correct order def __iter__(self): @@ -869,17 +869,17 @@ class sdict(IterableUserDict): index = self._key_list.index(key) if order == 'BEFORE': self._key_list.insert(index, newkey) - IterableUserDict.__setitem__(self, newkey, newvalue) + dict.__setitem__(self, newkey, newvalue) elif order == 'AFTER': self._key_list.insert(index + 1, newkey) - IterableUserDict.__setitem__(self, newkey, newvalue) + dict.__setitem__(self, newkey, newvalue) ## append support def append(self, sdict): for key in sdict: if key not in self._key_list: self._key_list.append(key) - IterableUserDict.__setitem__(self, key, sdict[key]) + dict.__setitem__(self, key, sdict[key]) def has_key(self, key): return key in self._key_list @@ -887,7 +887,7 @@ class sdict(IterableUserDict): ## Empty the dict def clear(self): self._key_list = [] - IterableUserDict.clear(self) + dict.clear(self) ## Return a copy of keys def keys(self): -- 2.16.2.windows.1