Remove orphaned ddns patches

Message ID f8fd96a2-60f6-bc05-de4a-75d4ccf3dd89@ipfire.org
State Accepted
Commit 95539a589e51dc2b0793ae58c1cd35f5fe858320
Headers
Series Remove orphaned ddns patches |

Commit Message

Peter Müller Oct. 23, 2021, 12:44 p.m. UTC
  These are no longer necessary, since ddns 0.14 comes with both of them
applied.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 ...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
  

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 <stefan.schantl@ipfire.org>
-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 <stefan.schantl@ipfire.org>
-
-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 <stefan.schantl@ipfire.org>
-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 <stefan.schantl@ipfire.org>
-
-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":