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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 56F56158020 for ; Sun, 25 Dec 2022 18:24:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93707E08EF; Sun, 25 Dec 2022 18:24:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73921E08EF for ; Sun, 25 Dec 2022 18:24:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 59A973410E8 for ; Sun, 25 Dec 2022 18:24:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E28F26F2 for ; Sun, 25 Dec 2022 18:24:39 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1671992673.39ae1e0de19462d3953a0680dcc32aa4b3e613f9.arthurzam@gentoo> Subject: [gentoo-commits] proj/pkgcore/snakeoil:master commit in: src/snakeoil/process/ X-VCS-Repository: proj/pkgcore/snakeoil X-VCS-Files: src/snakeoil/process/__init__.py src/snakeoil/process/spawn.py X-VCS-Directories: src/snakeoil/process/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 39ae1e0de19462d3953a0680dcc32aa4b3e613f9 X-VCS-Branch: master Date: Sun, 25 Dec 2022 18:24:39 +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: 23a7fc52-7734-4235-a1e1-2e068fde5cdb X-Archives-Hash: e437548954b63d149192fe9eedcd1ee1 commit: 39ae1e0de19462d3953a0680dcc32aa4b3e613f9 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 25 18:24:33 2022 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 25 18:24:33 2022 +0000 URL: https://gitweb.gentoo.org/proj/pkgcore/snakeoil.git/commit/?id=39ae1e0d remove proces.closerange Signed-off-by: Arthur Zamarin gentoo.org> src/snakeoil/process/__init__.py | 3 --- src/snakeoil/process/spawn.py | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/snakeoil/process/__init__.py b/src/snakeoil/process/__init__.py index 8966fd65..63c605d5 100644 --- a/src/snakeoil/process/__init__.py +++ b/src/snakeoil/process/__init__.py @@ -92,6 +92,3 @@ class CommandNotFound(Exception): class ProcessNotFound(Exception): def __init__(self, pid): super().__init__(f"nonexistent process: {pid}") - - -closerange = os.closerange diff --git a/src/snakeoil/process/spawn.py b/src/snakeoil/process/spawn.py index 48b60b1a..ce8fe58a 100644 --- a/src/snakeoil/process/spawn.py +++ b/src/snakeoil/process/spawn.py @@ -19,7 +19,7 @@ import sys from ..mappings import ProtectedDict from ..osutils import access -from . import CommandNotFound, closerange, find_binary +from . import find_binary BASH_BINARY = find_binary("bash", fallback="/bin/bash") SANDBOX_BINARY = find_binary("sandbox", fallback="/usr/bin/sandbox") @@ -336,10 +336,10 @@ def _exec( last = 0 for fd in sorted(fd_pipes): if fd != last: - closerange(last, fd) + os.closerange(last, fd) last = fd + 1 - closerange(last, max_fd_limit) + os.closerange(last, max_fd_limit) if cwd is not None: os.chdir(cwd)