public inbox for libabigail@sourceware.org
 help / color / mirror / Atom feed
From: Thomas Schwinge <thomas@codesourcery.com>
To: libabigail@sourceware.org
Cc: Dodji Seketeli <dodji@seketeli.org>,
	Mark Wielaard <mark@klomp.org>,
	Thomas Schwinge <thomas@codesourcery.com>
Subject: [PATCH] Replace Python 'import importlib' with 'import importlib.machinery'
Date: Tue, 21 Dec 2021 15:04:32 +0100	[thread overview]
Message-ID: <20211221140432.2159710-1-thomas@codesourcery.com> (raw)
In-Reply-To: <660b800832668cba9415c01d7cf5ab49438dba98.camel@klomp.org>

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


  reply	other threads:[~2021-12-21 14:04 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-17 22:26 [PATCH] Replace use of deprecated Python 'imp' module with 'importlib' Thomas Schwinge
2021-12-21 13:31 ` Dodji Seketeli
2021-12-21 13:43   ` Mark Wielaard
2021-12-21 14:04     ` Thomas Schwinge [this message]
2021-12-21 15:06       ` [PATCH] Replace Python 'import importlib' with 'import importlib.machinery' Dodji Seketeli
2021-12-21 15:43         ` Mark Wielaard
2021-12-21 16:19           ` Thomas Schwinge
2021-12-21 19:41             ` [PATCH] Handle several variants of Python 'imp', 'importlib' modules Thomas Schwinge
2022-01-03 16:33               ` Dodji Seketeli
2022-01-05 15:32                 ` Thomas Schwinge
2022-01-06 14:44                   ` Dodji Seketeli
2022-01-04 14:51               ` Mark Wielaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211221140432.2159710-1-thomas@codesourcery.com \
    --to=thomas@codesourcery.com \
    --cc=dodji@seketeli.org \
    --cc=libabigail@sourceware.org \
    --cc=mark@klomp.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).