Blame SOURCES/pki-core-platform-dependent-python-import.patch

f8ded1
From dfbd7c8d54dc27957438a722bc43e37b1b2057b6 Mon Sep 17 00:00:00 2001
f8ded1
From: Matthew Harmsen <mharmsen@redhat.com>
f8ded1
Date: Thu, 22 Jun 2017 12:50:21 -0600
f8ded1
Subject: [PATCH] dogtagpki Pagure Issue #2745 - Platform Dependent Python
f8ded1
 Import
f8ded1
f8ded1
(cherry picked from commit 9d63a7a6b1abb42595b6a24296a39a79441ba8df)
f8ded1
---
f8ded1
 base/common/python/pki/client.py | 5 ++++-
f8ded1
 1 file changed, 4 insertions(+), 1 deletion(-)
f8ded1
f8ded1
diff --git a/base/common/python/pki/client.py b/base/common/python/pki/client.py
f8ded1
index 805d0fa..e1a4d3f 100644
f8ded1
--- a/base/common/python/pki/client.py
f8ded1
+++ b/base/common/python/pki/client.py
f8ded1
@@ -25,7 +25,10 @@ import functools
f8ded1
 import warnings
f8ded1
 
f8ded1
 import requests
f8ded1
-from requests.packages.urllib3.exceptions import InsecureRequestWarning
f8ded1
+try:
f8ded1
+    from requests.packages.urllib3.exceptions import InsecureRequestWarning
f8ded1
+except ImportError:
f8ded1
+    from urllib3.exceptions import InsecureRequestWarning
f8ded1
 
f8ded1
 
f8ded1
 def catch_insecure_warning(func):
f8ded1
-- 
f8ded1
1.8.3.1
f8ded1