-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Dear Maintainer,

Following an email discussion with Sam Hartman (hartm...@debian.org), I
improved the fix for this issue.

It will now work with or without the availability of SSL.SSLTimeoutError.

Please consider this patch for inclusion in the python-pywbem package.

Kind Regards,

...Louis

- -- 
Louis Bouchard
Software engineer, Cloud & Sustaining eng.
Canonical Ltd
Ubuntu developer                       Debian Maintainer
GPG : 429D 7A3B DD05 B6F8 AF63  B9C4 8B3D 867C 823E 7A61
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAEBCAAGBQJVQOxrAAoJEIs9hnyCPnphSDUP/AlNgUPdnEYoLIHBNU8/NZES
ReGB9cmTIQw+wL1zgBRlpPXe0MVj3FH36hA29RNZapqBEovidEzq//ZpvaXsrWVz
U7uSgw98mR+1wPu4ejFyIq1b7Fk+r6iqlQg2wb82ZPixyh/v/qROssaQSzOSqV0e
LgcnpDnHtMfwIqDAI2YOalJZUjWeej4AQGfqB2nLdUBNUVMpGjNmNIbtjd/5Yhc1
5jnYcI7GIRYGYsKiSSyyC0HJK9UFZapSiJLVIMcopbtpz2rhzv1mVb6jh8wx8CvA
8jFZYQ++Kpg/Ez54746W3/gbuyu3/GtV+RAuT5tR6k96/73oF3CP/LlQmTN1U9Q9
3gKGVFvO4AiObxPZmN5CIwuVdSvSLDu70obCJKQrL/vxyOeGpbqShrqqNzEaf4RK
2AM0YJBXAS9BDJi1nVhcK8wa7+w35TAaQKBxuMLHFBv/2ittPZf5pJdhdpj8INWn
Y3tYHdVM22H739HTy4i13p0GyRQVpG+Gr1fNKkXnbprA9zPk5k50savLxdedymHx
lGcGfLuLCA+nlaC9ZW8c6DZv7rGNDWG2vrZVcb20wOpygCfd3pbZD7e1EN1gWfis
9qDFLHiScbWL5UC7EA6574DCfVw7pgMCNMbH6OiwWgPpiGF8TYOxB9RYDdGAB97W
08a3FpIwAv7ouNNNwaoh
=fx2S
-----END PGP SIGNATURE-----
Description: Fix incompatibility with M2Crypto, missing SSLTimeoutError
Author: Louis Bouchard <louis.bouch...@ubuntu.com>
Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=780264
---
--- cim_http.py.orig	2015-04-29 15:56:44.928475095 +0200
+++ cim_http.py	2015-04-29 15:56:16.320979327 +0200
@@ -168,8 +168,8 @@
                         if not check(self.sock.get_peer_cert(), self.host):
                             raise Error('SSL error: post connection check failed')
                 return ret
-            except ( Err.SSLError, SSL.SSLError, SSL.SSLTimeoutError
-                   , SSL.Checker.WrongHost), arg:
+            except ( Err.SSLError, SSL.SSLError, SSL.Checker.WrongHost, 
+                    getattr(SSL,'SSL.SSLTimeoutError',())), arg:
                 raise Error("SSL error: %s" % arg)
 
     class FileHTTPConnection(HTTPBaseConnection, httplib.HTTPConnection):

Reply via email to