From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web08.15260.1605138106303410278 for ; Wed, 11 Nov 2020 15:41:46 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: rANliloeotRR8po9Krku76zEYm2k341bYjW+UNMq9EyEcTLX4RXHmZCYorEtqRT02sFjVvJcMX LGOxZ5tZi8DQ== X-IronPort-AV: E=McAfee;i="6000,8403,9802"; a="234399112" X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="234399112" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2020 15:41:41 -0800 IronPort-SDR: vln31Nib5KnhQckfqsz9SwGy6Gna+IjFYGK9ZmcHHxFsNOqttfcPOCcxhwKTnEgSI1/DvnpEOD 3D4Vw+Ga+4xg== X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="366132804" Received: from aedesimo-desk.amr.corp.intel.com ([10.212.245.21]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2020 15:41:40 -0800 From: "Ashley E Desimone" To: devel@edk2.groups.io Cc: Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman , Erik Bjorge Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Replace imp.reload with importlib.reload Date: Wed, 11 Nov 2020 15:41:36 -0800 Message-Id: <20201111234136.1825-1-ashley.e.desimone@intel.com> X-Mailer: git-send-email 2.27.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The imp module is deprecated since Python 3.4 in favor of importlib. This patch replaces uses of imp.reload() with importlib.reload() and removes unused imp imports. Cc: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge Signed-off-by: Ashley E Desimone --- edkrepo/__main__.py | 4 ++-- edkrepo/edkrepo_cli.py | 1 - edkrepo/edkrepo_entry_point.py | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/edkrepo/__main__.py b/edkrepo/__main__.py index 115a779..2d538d3 100644 --- a/edkrepo/__main__.py +++ b/edkrepo/__main__.py @@ -7,7 +7,7 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent # -import imp +import importlib import os import sys import site @@ -23,7 +23,7 @@ for directory in sitepackages: edkrepo_site_dir = edkrepo_package_path break else: - imp.reload(edkrepo) + importlib.reload(edkrepo) import edkrepo.edkrepo_entry_point if __name__ == '__main__': diff --git a/edkrepo/edkrepo_cli.py b/edkrepo/edkrepo_cli.py index 4e7ff16..1adb63f 100644 --- a/edkrepo/edkrepo_cli.py +++ b/edkrepo/edkrepo_cli.py @@ -18,7 +18,6 @@ import os import subprocess import site import inspect -import imp import importlib.util import datetime as dt diff --git a/edkrepo/edkrepo_entry_point.py b/edkrepo/edkrepo_entry_point.py index dd2b36e..30d65ff 100644 --- a/edkrepo/edkrepo_entry_point.py +++ b/edkrepo/edkrepo_entry_point.py @@ -8,7 +8,7 @@ # import argparse -import imp +import importlib import importlib.util import inspect import json @@ -37,7 +37,7 @@ for directory in sitepackages: edkrepo_site_dir = edkrepo_package_path break else: - imp.reload(edkrepo) + importlib.reload(edkrepo) edkrepo_package_path = os.path.dirname(os.path.dirname(edkrepo.__file__)) for directory in sitepackages: if edkrepo_package_path == directory: -- 2.27.0.windows.1