public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-staging/EdkRepo] [PATCH] EdkRepo: Replace imp.reload with importlib.reload
@ 2020-11-11 23:41 Ashley E Desimone
  2020-11-15  3:00 ` Nate DeSimone
  2020-11-15  3:03 ` Nate DeSimone
  0 siblings, 2 replies; 3+ messages in thread
From: Ashley E Desimone @ 2020-11-11 23:41 UTC (permalink / raw)
  To: devel
  Cc: Nate DeSimone, Puja Pandya, Bret Barkelew, Prince Agyeman,
	Erik Bjorge

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 <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Signed-off-by: Ashley E Desimone <ashley.e.desimone@intel.com>
---
 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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Replace imp.reload with importlib.reload
  2020-11-11 23:41 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Replace imp.reload with importlib.reload Ashley E Desimone
@ 2020-11-15  3:00 ` Nate DeSimone
  2020-11-15  3:03 ` Nate DeSimone
  1 sibling, 0 replies; 3+ messages in thread
From: Nate DeSimone @ 2020-11-15  3:00 UTC (permalink / raw)
  To: Desimone, Ashley E, devel@edk2.groups.io
  Cc: Pandya, Puja, Bret Barkelew, Agyeman, Prince, Bjorge, Erik C

Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>

> -----Original Message-----
> From: Ashley E Desimone <ashley.e.desimone@intel.com>
> Sent: Wednesday, November 11, 2020 3:42 PM
> To: devel@edk2.groups.io
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja
> <puja.pandya@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>;
> Agyeman, Prince <prince.agyeman@intel.com>; Bjorge, Erik C
> <erik.c.bjorge@intel.com>
> Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Replace imp.reload with
> importlib.reload
> 
> 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 <ashley.e.desimone@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Puja Pandya <puja.pandya@intel.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Prince Agyeman <prince.agyeman@intel.com>
> Cc: Erik Bjorge <erik.c.bjorge@intel.com>
> Signed-off-by: Ashley E Desimone <ashley.e.desimone@intel.com>
> ---
>  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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Replace imp.reload with importlib.reload
  2020-11-11 23:41 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Replace imp.reload with importlib.reload Ashley E Desimone
  2020-11-15  3:00 ` Nate DeSimone
@ 2020-11-15  3:03 ` Nate DeSimone
  1 sibling, 0 replies; 3+ messages in thread
From: Nate DeSimone @ 2020-11-15  3:03 UTC (permalink / raw)
  To: Desimone, Ashley E, devel@edk2.groups.io
  Cc: Pandya, Puja, Bret Barkelew, Agyeman, Prince, Bjorge, Erik C

Pushed: https://github.com/tianocore/edk2-staging/commit/405bee4

> -----Original Message-----
> From: Ashley E Desimone <ashley.e.desimone@intel.com>
> Sent: Wednesday, November 11, 2020 3:42 PM
> To: devel@edk2.groups.io
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja
> <puja.pandya@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>;
> Agyeman, Prince <prince.agyeman@intel.com>; Bjorge, Erik C
> <erik.c.bjorge@intel.com>
> Subject: [edk2-staging/EdkRepo] [PATCH] EdkRepo: Replace imp.reload with
> importlib.reload
> 
> 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 <ashley.e.desimone@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Cc: Puja Pandya <puja.pandya@intel.com>
> Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
> Cc: Prince Agyeman <prince.agyeman@intel.com>
> Cc: Erik Bjorge <erik.c.bjorge@intel.com>
> Signed-off-by: Ashley E Desimone <ashley.e.desimone@intel.com>
> ---
>  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


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-11-15  3:03 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-11 23:41 [edk2-staging/EdkRepo] [PATCH] EdkRepo: Replace imp.reload with importlib.reload Ashley E Desimone
2020-11-15  3:00 ` Nate DeSimone
2020-11-15  3:03 ` Nate DeSimone

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox