From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 75C241382C5 for ; Fri, 25 Dec 2020 00:28:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 915ADE0AC2; Fri, 25 Dec 2020 00:28:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 782A1E0AC2 for ; Fri, 25 Dec 2020 00:28:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E3F83410DE for ; Fri, 25 Dec 2020 00:28:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F24B0451 for ; Fri, 25 Dec 2020 00:28:02 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1608855962.ff72973264827cbde7ba642a22e5d0579eeeb57a.floppym@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: src/ X-VCS-Repository: proj/portage X-VCS-Files: src/portage_util_file_copy_reflink_linux.c src/portage_util_libc.c X-VCS-Directories: src/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: ff72973264827cbde7ba642a22e5d0579eeeb57a X-VCS-Branch: master Date: Fri, 25 Dec 2020 00:28:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8364d31b-ae5d-413e-8ff7-c09bab63c194 X-Archives-Hash: dff7b7d8242b4e44511a236cbe02545e commit: ff72973264827cbde7ba642a22e5d0579eeeb57a Author: Mike Gilbert gentoo org> AuthorDate: Thu Dec 24 18:11:22 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Dec 25 00:26:02 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=ff729732 Drop Python 2 compatibility in extension modules Signed-off-by: Mike Gilbert gentoo.org> src/portage_util_file_copy_reflink_linux.c | 10 +--------- src/portage_util_libc.c | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/portage_util_file_copy_reflink_linux.c b/src/portage_util_file_copy_reflink_linux.c index 352342c06..c6affe57a 100644 --- a/src/portage_util_file_copy_reflink_linux.c +++ b/src/portage_util_file_copy_reflink_linux.c @@ -1,4 +1,4 @@ -/* Copyright 2017 Gentoo Foundation +/* Copyright 2017-2020 Gentoo Authors * Distributed under the terms of the GNU General Public License v2 */ @@ -25,7 +25,6 @@ static PyMethodDef reflink_linuxMethods[] = { {NULL, NULL, 0, NULL} }; -#if PY_MAJOR_VERSION >= 3 static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, "reflink_linux", /* m_name */ @@ -45,13 +44,6 @@ PyInit_reflink_linux(void) m = PyModule_Create(&moduledef); return m; } -#else -PyMODINIT_FUNC -initreflink_linux(void) -{ - Py_InitModule("reflink_linux", reflink_linuxMethods); -} -#endif /** diff --git a/src/portage_util_libc.c b/src/portage_util_libc.c index 977b95474..2a3e624dc 100644 --- a/src/portage_util_libc.c +++ b/src/portage_util_libc.c @@ -1,4 +1,4 @@ -/* Copyright 2005-2016 Gentoo Foundation +/* Copyright 2005-2020 Gentoo Authors * Distributed under the terms of the GNU General Public License v2 */ @@ -15,7 +15,6 @@ static PyMethodDef LibcMethods[] = { {NULL, NULL, 0, NULL} }; -#if PY_MAJOR_VERSION >= 3 static struct PyModuleDef moduledef = { PyModuleDef_HEAD_INIT, "libc", /* m_name */ @@ -35,13 +34,6 @@ PyInit_libc(void) m = PyModule_Create(&moduledef); return m; } -#else -PyMODINIT_FUNC -initlibc(void) -{ - Py_InitModule("libc", LibcMethods); -} -#endif static PyObject *