[Python-modules-team] Bug#780264: Bug #780264 : Proposed fix for incompatibility

[Louis Bouchard]

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

Dear maintainer,

I am working on the same issue on Ubuntu :

https://bugs.launchpad.net/ubuntu/+source/pywbem/+bug/1434991

This bug is caused by the fact that SSLTimeoutError does not exist in teh
M2Crypto python module and, according to the upstream git repository, has
never existed.

Here is a proposed patch that fixes this issue.

Please let me know if this is acceptable.

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

iQIcBAEBCAAGBQJVLoMAAAoJEIs9hnyCPnphJKcP/3l6SZuZSA7Y7gO7YCAa24Ry
hClYldE5OuBOyAzXgwjJsXk4EToMMqNTewbsHjvANHg24cBD0fxv1zdos42bYew6
xT9/x3+77EOtnukVfBEUu5lAIfLRVs9nIyt1LLWFS5rEx4yadB4ZMAbQskp8yMIa
RTWqyyVwp6EBTbx8o3lrgA5fG6qFTOxuQAt2v0025fqB91XAVIwPf8AXhS9zz3QN
K+S9KnKL0jgCyZgL8loLMTB7WbSoUooL7hFMyIs/SB/j+MKzgVg9JrApbAenh/2S
1VeSDjDJEX7KGPYs7xlPwoqbp85R/p6xCEvsbg8/SN4T5uIfSs/7mSLzk96CFBM2
wn9f/N1Nmai5pHkua64lDWH9qng/A6Cpk31pRGjV2rFqAsdjj0Fy7pNas5CggM5B
cTZYw++0oUm1j4wHLxmL6YmVZGm8pYlI9xoI/82d5Y+l5zYcCUuiB1GWwoPrm8I0
K7ziUDjeaSDixaAXOCloxZpDt8b38Agp0OOP3dHpkn5jEAeIgPzNKt/tA96sL+As
H9FrRmTY1fO/otFEYy9SFmnN5kchJFV7OJK8fmduGmJ94sr0t+n8Fx/kmNWBWTHk
eDwBB4QVmlOW/LbgkwjxXeZOE/QIiLTswMymv3PoSBGiNZbzjXlObyzkz/jCEf99
TrlNUtQBk3IJv0mAv5O6
=jZup
-----END PGP SIGNATURE-----
-------------- next part --------------
diff -u pywbem-0.8.0~dev650/debian/changelog pywbem-0.8.0~dev650/debian/changelog
--- pywbem-0.8.0~dev650/debian/changelog
+++ pywbem-0.8.0~dev650/debian/changelog
@@ -1,3 +1,11 @@
+pywbem (0.8.0~dev650-2) sid; urgency=medium
+
+  * pywbem/cim_http.c
+    - Remove SSLTimeoutError exception as this exception
+      is inexistant in M2Crypto (Closes: #780264)
+
+ -- Louis Bouchard <louis.bouchard at ubuntu.com>  Wed, 15 Apr 2015 08:59:30 -0500
+
 pywbem (0.8.0~dev650-1) unstable; urgency=low
 
   [ Bernd Zeimetz ]
only in patch2:
unchanged:
--- pywbem-0.8.0~dev650.orig/pywbem/cim_http.py
+++ pywbem-0.8.0~dev650/pywbem/cim_http.py
@@ -168,8 +168,7 @@
                         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), arg:
                 raise Error("SSL error: %s" % arg)
 
     class FileHTTPConnection(HTTPBaseConnection, httplib.HTTPConnection):