From patchwork Thu Jul 30 18:12:46 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 140285 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9EE334BBCDC4 for ; Thu, 30 Jul 2026 18:12:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9EE334BBCDC4 X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by sourceware.org (Postfix) with ESMTPS id 418674BB8F4A for ; Thu, 30 Jul 2026 18:12:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 418674BB8F4A Authentication-Results: sourceware.org; dmarc=fail (p=quarantine dis=none) header.from=seketeli.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 418674BB8F4A Authentication-Results: sourceware.org; arc=none smtp.remote-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1785435169; cv=none; b=XpVXJ8rukoIRIPmX8ImvUubVu2CiOJ6ydgVT0tM+yuIqpZxWA10ItzRZYuwHtBRpDZIfiVYEg0plRBmabPRtkTHkyic26MILEeeY3qIpldDNuOAsLnq2PWK4EsfsWgWkHTUOzHw8r1wdJfK1f62o/Ota90v/kzLEWDYOGohN1fQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1785435169; c=relaxed/simple; bh=KmRmu+DjRa+Gmsf3GRrLLJ75YgCIDUWoI8oWJusVrpg=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=T2V6NFbe8cjJlGKOKKApn3XdNh74MKfwV/o6oLscWFe/gyApuptDGPk+sF7IZIoFimA311S3tl7+AQxOtanf8iUIr+JdZt/7HYkaZpJbHbM4GRirbguFDrr1nM7T4htJLywAw7lUh7TMUXxdmo9ZaviixOpWZw9kTBJwXYqKJTo= ARC-Authentication-Results: i=1; sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 418674BB8F4A Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4954dff6536so498775e9.0 for ; Thu, 30 Jul 2026 11:12:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785435168; x=1786039968; h=content-type:mime-version:user-agent:message-id:date:organization :subject:to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=pj6K+OtoHiy7NXY1dGLHnt7k8pGa8S8TSqLAluzrz1A=; b=eaj8PdDyqvhA0vaJQMjWqa0HiSS37ulgqMX4RbSbsPsuL96QZJpp0mGR3zyY68xufD 6Sdd/uXxqRpBCYwSBZxezXzqv9VIGI2ThhrGg/PC6tH12s37Rm0te7KxMxq8XKtySO+D 43ceD+QNsJKKSBEIQEKVE9UuXHRm5kaH4dxtl+WcNnh0rk1iK6xnxOIwW/g1H6YkE1Mz 0ZziW01fmlYjJr7C855I/upQyoxxY1VxFuGKpf1M+KueDDX7J5dCLtMhyX1EWNIpv/Tm 4ppT0OntbkMbtsmCu5yzWuHck6E546h9muD0zkT8BprqeRNInGgJgaaKEkuxstRl0HBc R0Ng== X-Gm-Message-State: AOJu0Yx/vv58BJV9xc/Q4IUl1A7+YfCN8F7z2aXlcPysx2M5U/N46oBf lP7sRlncbcauVZ1hCHkoTWOtDaS92li3kBZwMk4LyT3vfCbnG93BGDZnuFIPjYiZ X-Gm-Gg: AR+sD10PWwsZQmicmST0ZVJ7/8Le2mf3vajb3q4fqnn51nBmLx2rq1t7HWyInXj1yB0 zTYmCqJKlOJ3QTqo81hTiWP880AbLxKw9YyV3nImlqmTY8RkIltnosybYE2PPWQMw0A/wDP9Z0k KdZKEct8/TBUGFrN1O5uNpMAp74J1H9HyPkpxpHRlUXnVda6ewXWu3SKqHAWgx67we4RXzx3pzh kkOTTMTSJ/mwgSvS35PZruJ0A0plN+4hSVJ9hdbmsBOfozRLGwhADlfd8Df/3X82qDdL2v5G+/V NG+WPhVxnfT0URSDOYSSiaCNOs8+FShV0dQfw/JT8yENewrskxzQZDYe4tAEYwjFLig7ZNu+OSF 7TPMBRwoj7sM/HwmcXQB9DOmO7rKaGB1N0DzRlUzQhlZXf0+kiXhx3xaBNwK/poMgKtoNx5EeV7 GHIpLWiG8h5gMid1zNi0ldwRw+1YSDiCxUCoWowhwdXZiZZgHAetKhy5s/0f385AxSzFPnbAJo7 zUUva3BHG8HmW8elGlro87m/EzNdDApyIBKvtMNW5Ckjps/7GI3mQ== X-Received: by 2002:a05:6000:2008:b0:47f:7f95:8a1e with SMTP id ffacd0b85a97d-47fc80c62a2mr5478594f8f.5.1785435167781; Thu, 30 Jul 2026 11:12:47 -0700 (PDT) Received: from localhost ([82.67.74.110]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47fc892cc49sm8187564f8f.17.2026.07.30.11.12.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jul 2026 11:12:46 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 3F2916058B8B; Thu, 30 Jul 2026 20:12:46 +0200 (CEST) From: Dodji Seketeli To: libabigail@sourceware.org Subject: [PATCH 1/9] tests/mockfedabipkgdiff.in: Fix python module loading Organization: Me, myself and I X-Operating-System: Fedora 45 X-URL: http://www.seketeli.net/~dodji Date: Thu, 30 Jul 2026 20:12:46 +0200 Message-ID: <87o6fopcrl.fsf@seketeli.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-Spam-Status: No, score=-6.0 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, LOCAL_AUTHENTICATION_FAIL_DMARC, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libabigail-bounces~patchwork=sourceware.org@sourceware.org Hello, The master branch was failing to build in Fedora 45 (Rawhide) due to a python-3 related change in package availability. Fixed thus. * tests/mockfedabipkgdiff.in (load_source): Make this work for python 3. Applied to the master branch. Signed-off-by: Dodji Seketeli --- tests/mockfedabipkgdiff.in | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/tests/mockfedabipkgdiff.in b/tests/mockfedabipkgdiff.in index 863cf7f6..6abbb99e 100644 --- a/tests/mockfedabipkgdiff.in +++ b/tests/mockfedabipkgdiff.in @@ -69,30 +69,19 @@ def get_download_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 importlib.util + from importlib.machinery import SourceFileLoader + + loader = SourceFileLoader(name, path) + spec = importlib.util.spec_from_file_location(name, path, loader=loader) + if spec is None: + raise ImportError(f"Cannot find module '{name}' at path '{path}'") + module = importlib.util.module_from_spec(spec) + import sys + sys.modules[name] = module + spec.loader.exec_module(module) + return module # Import the fedabipkgdiff program file from the source directory. fedabipkgdiff_mod = load_source('fedabipkgdiff', FEDABIPKGDIFF)