[Python-apps-commits] r13987 - in packages/nagstamon/trunk/debian (4 files)

[moschlar-guest at users.alioth.debian.org]

    Date: Wednesday, May 3, 2017 @ 12:55:30
  Author: moschlar-guest
Revision: 13987

Don't disable InsecureRequestWarning warnings from urllib3 
Closes: #861152

Added:
  packages/nagstamon/trunk/debian/patches/not-disable-warnings.patch
Modified:
  packages/nagstamon/trunk/debian/changelog
  packages/nagstamon/trunk/debian/patches/series
Deleted:
  packages/nagstamon/trunk/debian/patches/disable-InsecureRequestWarning-warnings.patch

Modified: packages/nagstamon/trunk/debian/changelog
===================================================================
--- packages/nagstamon/trunk/debian/changelog	2017-05-03 07:47:40 UTC (rev 13986)
+++ packages/nagstamon/trunk/debian/changelog	2017-05-03 12:55:30 UTC (rev 13987)
@@ -1,3 +1,10 @@
+nagstamon (2.0.1-5) unstable; urgency=medium
+
+  * Don't disable InsecureRequestWarning warnings from urllib3 
+    Closes: #861152
+
+ -- Moritz Schlarb <schlarbm at uni-mainz.de>  Wed, 03 May 2017 14:47:04 +0200
+
 nagstamon (2.0.1-4) unstable; urgency=medium
 
   * Add Recommends for python3-secretstorage to debian/control

Deleted: packages/nagstamon/trunk/debian/patches/disable-InsecureRequestWarning-warnings.patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/disable-InsecureRequestWarning-warnings.patch	2017-05-03 07:47:40 UTC (rev 13986)
+++ packages/nagstamon/trunk/debian/patches/disable-InsecureRequestWarning-warnings.patch	2017-05-03 12:55:30 UTC (rev 13987)
@@ -1,17 +0,0 @@
-Description: Really disable InsecureRequestWarning warnings
-Author: Moritz Schlarb <schlarbm at uni-mainz.de>
-Bug-Debian: https://bugs.debian.org/861152
-
-diff --git a/Nagstamon/Servers/Generic.py b/Nagstamon/Servers/Generic.py
-index dd9dcb1..825e209 100644
---- a/Nagstamon/Servers/Generic.py
-+++ b/Nagstamon/Servers/Generic.py
-@@ -20,7 +20,7 @@
- import requests
- # disable annoying InsecureRequestWarning warnings
- try:
--    requests.packages.urllib3.disable_warnings()
-+    requests.packages.urllib3.disable_warnings(requests.packages.urllib3.exceptions.InsecureRequestWarning)
- except:
-     # older requests version might not have the packages submodule
-     # for example the one in Ubuntu 14.04

Added: packages/nagstamon/trunk/debian/patches/not-disable-warnings.patch
===================================================================
--- packages/nagstamon/trunk/debian/patches/not-disable-warnings.patch	                        (rev 0)
+++ packages/nagstamon/trunk/debian/patches/not-disable-warnings.patch	2017-05-03 12:55:30 UTC (rev 13987)
@@ -0,0 +1,23 @@
+Description: Don't disable InsecureRequestWarning warnings
+Author: Moritz Schlarb <schlarbm at uni-mainz.de>
+Bug-Debian: https://bugs.debian.org/861152
+Bug-Debian: https://bugs.debian.org/861725
+
+diff --git a/Nagstamon/Servers/Generic.py b/Nagstamon/Servers/Generic.py
+index dd9dcb1..17ebf17 100644
+--- a/Nagstamon/Servers/Generic.py
++++ b/Nagstamon/Servers/Generic.py
+@@ -18,13 +18,6 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ 
+ import requests
+-# disable annoying InsecureRequestWarning warnings
+-try:
+-    requests.packages.urllib3.disable_warnings()
+-except:
+-    # older requests version might not have the packages submodule
+-    # for example the one in Ubuntu 14.04
+-    pass
+ 
+ import sys
+ import socket

Modified: packages/nagstamon/trunk/debian/patches/series
===================================================================
--- packages/nagstamon/trunk/debian/patches/series	2017-05-03 07:47:40 UTC (rev 13986)
+++ packages/nagstamon/trunk/debian/patches/series	2017-05-03 12:55:30 UTC (rev 13987)
@@ -1,4 +1,4 @@
-disable-InsecureRequestWarning-warnings.patch
+not-disable-warnings.patch
 check-for-new-version.patch
 no-QtCore-in-setup-py.patch
 spelling-error-in-manpage.patch