[PATCH] Replace use of deprecated Python 'imp' module with 'importlib'

[PATCH] Replace use of deprecated Python 'imp' module with 'importlib'

[Thomas Schwinge]

In the test logs, I've found a number of:

    [...]/tests/mockfedabipkgdiff:42: DeprecationWarning: the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses
      import imp

I've asked The Internet what to do about that, and this commit is the result.
But beware: I'm not a Python wizard.

	* tests/mockfedabipkgdiff.in: Replace use of deprecated Python
	'imp' module with 'importlib'.

CC: Chenxiong Qi <cqi@redhat.com>
Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
---
 tests/mockfedabipkgdiff.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/mockfedabipkgdiff.in b/tests/mockfedabipkgdiff.in
index e775526e..7de42b86 100644
--- a/tests/mockfedabipkgdiff.in
+++ b/tests/mockfedabipkgdiff.in
@@ -39,7 +39,7 @@ variables.
 
 import os
 import tempfile
-import imp
+import importlib
 import six
 
 try:
@@ -70,7 +70,7 @@ def get_download_dir():
 
 
 # Import the fedabipkgdiff program file from the source directory.
-fedabipkgdiff_mod = imp.load_source('fedabipkgdiff', FEDABIPKGDIFF)
+fedabipkgdiff_mod = importlib.machinery.SourceFileLoader('fedabipkgdiff', FEDABIPKGDIFF).load_module()
 
 
 # -----------------  Koji resource storage begins ------------------
-- 
2.25.1

Re: [PATCH] Replace use of deprecated Python 'imp' module with 'importlib'

[Dodji Seketeli]

Thomas Schwinge <thomas@codesourcery.com> a écrit:

> In the test logs, I've found a number of:
>
>     [...]/tests/mockfedabipkgdiff:42: DeprecationWarning: the imp module is deprecated in favour of importlib; see the module's documentation for alternative uses
>       import imp
>
> I've asked The Internet what to do about that, and this commit is the result.
> But beware: I'm not a Python wizard.
>
> 	* tests/mockfedabipkgdiff.in: Replace use of deprecated Python
> 	'imp' module with 'importlib'.
>
> CC: Chenxiong Qi <cqi@redhat.com>
> Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>

Applied to master. Thanks!

[...]

Cheers,

-- 
		Dodji

Re: [PATCH] Replace use of deprecated Python 'imp' module with 'importlib'

[Mark Wielaard]

Hi,

On Tue, 2021-12-21 at 14:31 +0100, Dodji Seketeli wrote:
> Thomas Schwinge <thomas@codesourcery.com> a écrit:
> 
> > In the test logs, I've found a number of:
> > 
> >     [...]/tests/mockfedabipkgdiff:42: DeprecationWarning: the imp
> > module is deprecated in favour of importlib; see the module's
> > documentation for alternative uses
> >       import imp
> > 
> > I've asked The Internet what to do about that, and this commit is
> > the result.
> > But beware: I'm not a Python wizard.
> > 
> > 	* tests/mockfedabipkgdiff.in: Replace use of deprecated Python
> > 	'imp' module with 'importlib'.
> > 
> > CC: Chenxiong Qi <cqi@redhat.com>
> > Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
> 
> Applied to master. Thanks!

The buildbot is a little slow being busy with elfutil commits:

https://builder.wildebeest.org/buildbot/#/pendingbuildrequests

But this seems to have broken something on centos7 x86_64:

https://builder.wildebeest.org/buildbot/#/changes/7273

  File "/srv/buildbot/worker/libabigail-centos-
x86_64/build/tests/mockfedabipkgdiff", line 73, in <module>
    fedabipkgdiff_mod =
importlib.machinery.SourceFileLoader('fedabipkgdiff',
FEDABIPKGDIFF).load_module()
AttributeError: 'module' object has no attribute 'machinery'

Cheers,

Mark

[PATCH] Replace Python 'import importlib' with 'import importlib.machinery'

[Thomas Schwinge]

Fix-up for recent commit f0582fdbf1267f0f34bf3c3b6698b60026410146
"Replace use of deprecated Python 'imp' module with 'importlib'", which...

    [...] seems to have broken something on centos7 x86_64:

    https://builder.wildebeest.org/buildbot/#/changes/7273

      File "/srv/buildbot/worker/libabigail-centos-x86_64/build/tests/mockfedabipkgdiff", line 73, in <module>
        fedabipkgdiff_mod = importlib.machinery.SourceFileLoader('fedabipkgdiff', FEDABIPKGDIFF).load_module()
    AttributeError: 'module' object has no attribute 'machinery'

Again, I've asked The Internet what to do about that, and this commit is the
result.  But beware: I'm still not a Python wizard.

	* tests/mockfedabipkgdiff.in: Replace Python 'import importlib'
	with 'import importlib.machinery'.
---
 tests/mockfedabipkgdiff.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/mockfedabipkgdiff.in b/tests/mockfedabipkgdiff.in
index 7de42b86..29a28ad9 100644
--- a/tests/mockfedabipkgdiff.in
+++ b/tests/mockfedabipkgdiff.in
@@ -39,7 +39,7 @@ variables.
 
 import os
 import tempfile
-import importlib
+import importlib.machinery
 import six
 
 try:
-- 
2.25.1

Re: [PATCH] Replace Python 'import importlib' with 'import importlib.machinery'

[Dodji Seketeli]

Thomas Schwinge <thomas@codesourcery.com> a écrit:

> Fix-up for recent commit f0582fdbf1267f0f34bf3c3b6698b60026410146
> "Replace use of deprecated Python 'imp' module with 'importlib'", which...
>
>     [...] seems to have broken something on centos7 x86_64:
>
>     https://builder.wildebeest.org/buildbot/#/changes/7273
>
>       File "/srv/buildbot/worker/libabigail-centos-x86_64/build/tests/mockfedabipkgdiff", line 73, in <module>
>         fedabipkgdiff_mod = importlib.machinery.SourceFileLoader('fedabipkgdiff', FEDABIPKGDIFF).load_module()
>     AttributeError: 'module' object has no attribute 'machinery'
>
> Again, I've asked The Internet what to do about that, and this commit is the
> result.  But beware: I'm still not a Python wizard.
>
> 	* tests/mockfedabipkgdiff.in: Replace Python 'import importlib'
> 	with 'import importlib.machinery'.

Applied to master.

Cheers,

-- 
		Dodji

Re: [PATCH] Replace Python 'import importlib' with 'import importlib.machinery'

[Mark Wielaard]

Hi,

On Tue, 2021-12-21 at 16:06 +0100, Dodji Seketeli wrote:
> Thomas Schwinge <thomas@codesourcery.com> a écrit:
> 
> > Fix-up for recent commit f0582fdbf1267f0f34bf3c3b6698b60026410146
> > "Replace use of deprecated Python 'imp' module with 'importlib'",
> > which...
> > 
> >     [...] seems to have broken something on centos7 x86_64:
> > 
> >     https://builder.wildebeest.org/buildbot/#/changes/7273
> > 
> >       File "/srv/buildbot/worker/libabigail-centos-
> > x86_64/build/tests/mockfedabipkgdiff", line 73, in <module>
> >         fedabipkgdiff_mod =
> > importlib.machinery.SourceFileLoader('fedabipkgdiff',
> > FEDABIPKGDIFF).load_module()
> >     AttributeError: 'module' object has no attribute 'machinery'
> > 
> > Again, I've asked The Internet what to do about that, and this
> > commit is the
> > result.  But beware: I'm still not a Python wizard.
> > 
> > 	* tests/mockfedabipkgdiff.in: Replace Python 'import importlib'
> > 	with 'import importlib.machinery'.
> 
> Applied to master.

Sadly still failing:
https://builder.wildebeest.org/buildbot/#/builders/8/builds/802

Note that this is a centos7 install with just python2 and there is no
python3-koji, only python2-koji, which is needed to run the
runtestfedabipkgdiff.py test.

Maybe this test should just be disabled for python2 only systems?

Cheers,

Mark

Re: [PATCH] Replace Python 'import importlib' with 'import importlib.machinery'

[Thomas Schwinge]

Hi!

On 2021-12-21T16:43:40+0100, Mark Wielaard <mark@klomp.org> wrote:
> On Tue, 2021-12-21 at 16:06 +0100, Dodji Seketeli wrote:
>> Thomas Schwinge <thomas@codesourcery.com> a écrit:
>> > Fix-up for recent commit f0582fdbf1267f0f34bf3c3b6698b60026410146
>> > "Replace use of deprecated Python 'imp' module with 'importlib'",
>> > which...
>> >
>> >     [...] seems to have broken something on centos7 x86_64:
>> >
>> >     https://builder.wildebeest.org/buildbot/#/changes/7273
>> >
>> >       File "/srv/buildbot/worker/libabigail-centos-
>> > x86_64/build/tests/mockfedabipkgdiff", line 73, in <module>
>> >         fedabipkgdiff_mod =
>> > importlib.machinery.SourceFileLoader('fedabipkgdiff',
>> > FEDABIPKGDIFF).load_module()
>> >     AttributeError: 'module' object has no attribute 'machinery'
>> >
>> > Again, I've asked The Internet what to do about that, and this
>> > commit is the
>> > result.  But beware: I'm still not a Python wizard.
>> >
>> >    * tests/mockfedabipkgdiff.in: Replace Python 'import importlib'
>> >    with 'import importlib.machinery'.
>>
>> Applied to master.
>
> Sadly still failing:
> https://builder.wildebeest.org/buildbot/#/builders/8/builds/802

I'm sorry for the repeated breakage.

> Note that this is a centos7 install with just python2

Aha -- Python 2.  And yes, I now see that I'm able to reproduce the
problem with Python 2; I'll send another patch later.

> and there is no
> python3-koji, only python2-koji, which is needed to run the
> runtestfedabipkgdiff.py test.

Well, regarding that one, see my recent
commit feb441e284a03f3ff86fd0962cfaf5a9efedf28d
"fedabipkgdiff: Enable testing without proper Koji installation".  ;-D

> Maybe this test should just be disabled for python2 only systems?

No.  It use to work, and should continue to.  Let me give it one more
try...


Grüße
 Thomas
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955

[PATCH] Handle several variants of Python 'imp', 'importlib' modules

[Thomas Schwinge]

Fix-up for recent commit f0582fdbf1267f0f34bf3c3b6698b60026410146
"Replace use of deprecated Python 'imp' module with 'importlib'", and
commit cc1f38ffedb8d456d43fb52c369409037c5ca4a
"Replace Python 'import importlib' with 'import importlib.machinery'",
because... compatibility.

Once more, I've asked The Internet what to do about that, and this commit is
the result.  But beware: I'm still not much of a Python wizard.

	* tests/mockfedabipkgdiff.in: Handle several variants of Python
	'imp', 'importlib' modules.
---
 tests/mockfedabipkgdiff.in | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/tests/mockfedabipkgdiff.in b/tests/mockfedabipkgdiff.in
index 29a28ad9..1e562666 100644
--- a/tests/mockfedabipkgdiff.in
+++ b/tests/mockfedabipkgdiff.in
@@ -39,7 +39,6 @@ variables.
 
 import os
 import tempfile
-import importlib.machinery
 import six
 
 try:
@@ -69,8 +68,34 @@ def get_download_dir():
     return DOWNLOAD_CACHE_DIR
 
 
+def load_source(name, path):
+    # Different version of Python want this be done differently.
+    try:
+        import importlib.machinery
+        loader = importlib.machinery.SourceFileLoader(name, path)
+        import importlib.util
+        spec = importlib.util.spec_from_loader(name, loader)
+        module = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(module)
+        import sys.modules
+        sys.modules[name] = module
+        return module
+    except:
+        pass
+    try:
+        import importlib.machinery
+        loader = importlib.machinery.SourceFileLoader(name, path)
+        module = loader.load_module()
+        return module
+    except:
+        pass
+    import imp
+    module = imp.load_source(name, path)
+    return module
+
+
 # Import the fedabipkgdiff program file from the source directory.
-fedabipkgdiff_mod = importlib.machinery.SourceFileLoader('fedabipkgdiff', FEDABIPKGDIFF).load_module()
+fedabipkgdiff_mod = load_source('fedabipkgdiff', FEDABIPKGDIFF)
 
 
 # -----------------  Koji resource storage begins ------------------
-- 
2.25.1

Re: [PATCH] Handle several variants of Python 'imp', 'importlib' modules

[Dodji Seketeli]

Hello Thomas,

Happy New Years!

Thomas Schwinge <thomas@codesourcery.com> a écrit:

> Fix-up for recent commit f0582fdbf1267f0f34bf3c3b6698b60026410146
> "Replace use of deprecated Python 'imp' module with 'importlib'", and
> commit cc1f38ffedb8d456d43fb52c369409037c5ca4a
> "Replace Python 'import importlib' with 'import importlib.machinery'",
> because... compatibility.
>
> Once more, I've asked The Internet what to do about that, and this commit is
> the result.  But beware: I'm still not much of a Python wizard.
>
> 	* tests/mockfedabipkgdiff.in: Handle several variants of Python
> 	'imp', 'importlib' modules.

The patch looks good to me.

However, it lacks the 'signed-of-by' mention.

[...]

Cheers,

-- 
		Dodji

[PATCH] Handle several variants of Python 'imp', 'importlib' modules

[Thomas Schwinge]

Fix-up for recent commit f0582fdbf1267f0f34bf3c3b6698b60026410146
"Replace use of deprecated Python 'imp' module with 'importlib'", and
commit cc1f38ffedb8d456d43fb52c369409037c5ca4a
"Replace Python 'import importlib' with 'import importlib.machinery'",
because compatibility...

	* tests/mockfedabipkgdiff.in: Handle several variants of Python
	'imp', 'importlib' modules.

Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
Tested-by: Mark Wielaard <mark@klomp.org> (CentOS 7)
---
 tests/mockfedabipkgdiff.in | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git tests/mockfedabipkgdiff.in tests/mockfedabipkgdiff.in
index 29a28ad9..1e562666 100644
--- tests/mockfedabipkgdiff.in
+++ tests/mockfedabipkgdiff.in
@@ -39,7 +39,6 @@ variables.
 
 import os
 import tempfile
-import importlib.machinery
 import six
 
 try:
@@ -69,8 +68,34 @@ def get_download_dir():
     return DOWNLOAD_CACHE_DIR
 
 
+def load_source(name, path):
+    # Different version of Python want this be done differently.
+    try:
+        import importlib.machinery
+        loader = importlib.machinery.SourceFileLoader(name, path)
+        import importlib.util
+        spec = importlib.util.spec_from_loader(name, loader)
+        module = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(module)
+        import sys.modules
+        sys.modules[name] = module
+        return module
+    except:
+        pass
+    try:
+        import importlib.machinery
+        loader = importlib.machinery.SourceFileLoader(name, path)
+        module = loader.load_module()
+        return module
+    except:
+        pass
+    import imp
+    module = imp.load_source(name, path)
+    return module
+
+
 # Import the fedabipkgdiff program file from the source directory.
-fedabipkgdiff_mod = importlib.machinery.SourceFileLoader('fedabipkgdiff', FEDABIPKGDIFF).load_module()
+fedabipkgdiff_mod = load_source('fedabipkgdiff', FEDABIPKGDIFF)
 
 
 # -----------------  Koji resource storage begins ------------------
-- 
2.34.1

Re: [PATCH] Handle several variants of Python 'imp', 'importlib' modules

[Dodji Seketeli]

Thomas Schwinge <thomas@codesourcery.com> a écrit:

> Fix-up for recent commit f0582fdbf1267f0f34bf3c3b6698b60026410146
> "Replace use of deprecated Python 'imp' module with 'importlib'", and
> commit cc1f38ffedb8d456d43fb52c369409037c5ca4a
> "Replace Python 'import importlib' with 'import importlib.machinery'",
> because compatibility...
>
> 	* tests/mockfedabipkgdiff.in: Handle several variants of Python
> 	'imp', 'importlib' modules.
>
> Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
> Tested-by: Mark Wielaard <mark@klomp.org> (CentOS 7)

Applied to master, thanks!

[...]

Cheers,


-- 
		Dodji

Re: [PATCH] Handle several variants of Python 'imp', 'importlib' modules

[Mark Wielaard]

Hi Thomas,

On Tue, 2021-12-21 at 20:41 +0100, Thomas Schwinge wrote:
> Fix-up for recent commit f0582fdbf1267f0f34bf3c3b6698b60026410146
> "Replace use of deprecated Python 'imp' module with 'importlib'", and
> commit cc1f38ffedb8d456d43fb52c369409037c5ca4a
> "Replace Python 'import importlib' with 'import
> importlib.machinery'",
> because... compatibility.
> 
> Once more, I've asked The Internet what to do about that, and this
> commit is
> the result.  But beware: I'm still not much of a Python wizard.
> 
> 	* tests/mockfedabipkgdiff.in: Handle several variants of Python
> 	'imp', 'importlib' modules.

This variant works for me on a CentOS 7 setup.

Thanks,

Mark