From nobody Mon Dec 13 08:13:42 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 96C1918DFC83; Mon, 13 Dec 2021 08:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JCDmQ24Ftz3nV5; Mon, 13 Dec 2021 08:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 26E7611788; Mon, 13 Dec 2021 08:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BD8Dgkr087377; Mon, 13 Dec 2021 08:13:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BD8Dgjw087376; Mon, 13 Dec 2021 08:13:42 GMT (envelope-from git) Date: Mon, 13 Dec 2021 08:13:42 GMT Message-Id: <202112130813.1BD8Dgjw087376@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ruslan Makhmatkhanov Subject: git: 7f72e5b71a62 - main - net-p2p/deluge: fix runtime with python3.8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f72e5b71a62e7ee4ae317067f8a4a5e889539e0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639383222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=50oBau0Zi68ZX55ftG3NIjvmZq73CUw7g3X3OU63N8E=; b=T6qVDIO9KqPf/QV+dRY9tHvlyDSUjwfHKw7c72zjfzNZRKceevjn8xYg80mq81hy2n2Xqr otR7TouED7ymQoSTHd0l37Jjd8uTENOjlI+vp7l2baqSqwaR0Cims2TDt3QXeRyWmlAvkD YrR7AbETFK+824EdHoJJus+sWI3ZJ6/JqYH3dJHOJ+6htYcVNvvMENLxy43knrDhqNgi4y V5BziAOpqtwA5yy5FjQurMQ49jl+YY2SH0CzAXZN6Yu8xt7Yj4bh2MeIWC1qRi1wku/4NJ r1h145jjacfs0Go0G2JYIM1HzrUmeIeCpWejl5FGijyaxc0tvAsWeKvvPf3rvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639383222; a=rsa-sha256; cv=none; b=FUWlLLVD3QT1xZqaE814x614su0a4zowhafI+DqBmM1UPDg8BxErF3RlezNGWYcLyEl37u Vq0esx+eQcbzof60yqYhcIk4NIaCZLpfQepThtosYuw6PhEskbETXKHmTNPURrIav0F1wH aFGOjuyUcH+fG8nK6J9CxXYa67RoVvNauhHnUHL9IJ82ZKjit4WeSRB36QKv+uBCEr61bS 3K/7pgsjPpt0p8bxnO3nYUgYJOfJhzIYydQ01djJ/xXFACkIZpxJmFsVqAmCrnkp5trQyk 4AR8HVgVdGHLaRcM8TzBd7xfhRyCZxFg+NaKRAfgih4bxrh7Sn7wjll2A63wBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rm: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f72e5b71a62e7ee4ae317067f8a4a5e889539e0 commit 7f72e5b71a62e7ee4ae317067f8a4a5e889539e0 Author: Ruslan Makhmatkhanov AuthorDate: 2021-12-13 08:11:24 +0000 Commit: Ruslan Makhmatkhanov CommitDate: 2021-12-13 08:11:24 +0000 net-p2p/deluge: fix runtime with python3.8 Add upstream patch, that's fixing run with python3.8 Reported by: Daniel O'Connor --- net-p2p/deluge-cli/Makefile | 2 +- net-p2p/deluge-cli/files/patch-deluge_log.py | 29 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/net-p2p/deluge-cli/Makefile b/net-p2p/deluge-cli/Makefile index 173bbc310188..841069334df5 100644 --- a/net-p2p/deluge-cli/Makefile +++ b/net-p2p/deluge-cli/Makefile @@ -1,6 +1,6 @@ PORTNAME= deluge DISTVERSION= 2.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-p2p python MASTER_SITES= CHEESESHOP PKGNAMESUFFIX= -cli diff --git a/net-p2p/deluge-cli/files/patch-deluge_log.py b/net-p2p/deluge-cli/files/patch-deluge_log.py new file mode 100644 index 000000000000..c908439441da --- /dev/null +++ b/net-p2p/deluge-cli/files/patch-deluge_log.py @@ -0,0 +1,29 @@ +From 351664ec071daa04161577c6a1c949ed0f2c3206 Mon Sep 17 00:00:00 2001 +From: minus +Date: Sun, 17 Nov 2019 09:36:23 +0100 +Subject: [Logging] Fix Python 3.8 compatibility + +Deluge's logger class extends Python's `logging.Logger`. Since Python +3.8, it takes an additional argument `stacklevel`. +The implementation in Deluge does not support that. Work around the +problem by ignoring additional arguments. +--- + deluge/log.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/deluge/log.py b/deluge/log.py +index 75e8308..0f9877f 100644 +--- deluge/log.py ++++ deluge/log.py +@@ -86,7 +86,7 @@ class Logging(LoggingLoggerClass): + def exception(self, msg, *args, **kwargs): + yield LoggingLoggerClass.exception(self, msg, *args, **kwargs) + +- def findCaller(self, stack_info=False): # NOQA: N802 ++ def findCaller(self, *args, **kwargs): # NOQA: N802 + f = logging.currentframe().f_back + rv = '(unknown file)', 0, '(unknown function)' + while hasattr(f, 'f_code'): +-- +cgit v1.1 +