From patchwork Sat Oct 23 12:44:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 4817 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Hc1C31sLjz3wcp for ; Sat, 23 Oct 2021 12:45:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Hc1C23Wqnz1gl; Sat, 23 Oct 2021 12:45:02 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Hc1C22fC4z2xZG; Sat, 23 Oct 2021 12:45:02 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Hc1C02VZLz2xF1 for ; Sat, 23 Oct 2021 12:45:00 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Hc1Bz19rSzl6 for ; Sat, 23 Oct 2021 12:44:58 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1634993099; 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=+DN9xfdqOHvpJ39b+h3DIgKXyDowCt8rT3aolR+j6bk=; b=B+j3TZxKK8Ay0pFKkE4v+cf2NWRsgRmqoOojauMHQQO4y+DVORLv37Eq1bzG/QheqGRHs0 jQfnzSjR6g4bQSAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1634993099; 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=+DN9xfdqOHvpJ39b+h3DIgKXyDowCt8rT3aolR+j6bk=; b=plSdAnZPvwww7AiCxsuaxBs/g+pcSI/x3rYhbPOhXOvYlo4ysXNtWjmfep/gdUluaUEoQb CeSaB516ohY29iSEGnkeHRoKirxk4Qf2VuX7D6Op0r6RR6fR6wLCD7Wp65IAxAXNT2zv3K WmAkfGhAHUXTwipAOAS4hKQO5Cknh46kNZ8APFvVoxAM5YCzGQqp8CoZELYE7ToOcQ9mTG IbQA7U/Lmaz15HXOaPuL/5ccWMnrEd6vHQdqLvOE6R0/EhOPII0WhkLEW8A/K1PEQv+hck ZhHaCau+DC4Zba7wG10dbU10+Gnqw3xAoGSOlkqtSOvOu9OQT1ZIwvbZWL7I1g== To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] Remove orphaned ddns patches Message-ID: Date: Sat, 23 Oct 2021 14:44:56 +0200 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" These are no longer necessary, since ddns 0.14 comes with both of them applied. Signed-off-by: Peter Müller --- ...nss-fix-unhandled-exeption-on-update-patch | 30 ------------------- ...nss-fix-unhandled-exeption-on-update-patch | 30 ------------------- 2 files changed, 60 deletions(-) delete mode 100644 src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch delete mode 100644 src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch diff --git a/src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch b/src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch deleted file mode 100644 index 95f6391be..000000000 --- a/src/patches/ddns-011-ddnss-fix-unhandled-exeption-on-update-patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 7d0956d14ff8d823551ccd47ccf1492c9da9aac9 -Author: Stefan Schantl -Date: Mon May 25 18:00:51 2020 +0200 - - ProviderDDNSS: Fix unhandled exception on update - - In python > 3.3 the getheader() attribute is not longer part of the - urllib.response response.info() object. It is part of response object - and so directly can be accessed. - - Fixes #12328 - - Signed-off-by: Stefan Schantl - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index f1fed22..46d8a67 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -642,10 +642,8 @@ class DDNSProviderDDNSS(DDNSProvider): - response = self.send_request(self.url, data=data) - - # This provider sends the response code as part of the header. -- header = response.info() -- - # Get status information from the header. -- output = header.getheader('ddnss-response') -+ output = response.getheader('ddnss-response') - - # Handle success messages. - if output == "good" or output == "nochg": diff --git a/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch b/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch deleted file mode 100644 index 95f6391be..000000000 --- a/src/patches/ddns-013-ddnss-fix-unhandled-exeption-on-update-patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 7d0956d14ff8d823551ccd47ccf1492c9da9aac9 -Author: Stefan Schantl -Date: Mon May 25 18:00:51 2020 +0200 - - ProviderDDNSS: Fix unhandled exception on update - - In python > 3.3 the getheader() attribute is not longer part of the - urllib.response response.info() object. It is part of response object - and so directly can be accessed. - - Fixes #12328 - - Signed-off-by: Stefan Schantl - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index f1fed22..46d8a67 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -642,10 +642,8 @@ class DDNSProviderDDNSS(DDNSProvider): - response = self.send_request(self.url, data=data) - - # This provider sends the response code as part of the header. -- header = response.info() -- - # Get status information from the header. -- output = header.getheader('ddnss-response') -+ output = response.getheader('ddnss-response') - - # Handle success messages. - if output == "good" or output == "nochg":