Fix some generator-related exceptions with Python >=2.5 (bug #262900).

Package-Manager: portage-15152-svn/cvs/Linux x86_64

4 files changed, 75 insertions, 8 deletions

diff --git a/dev-python/tlslite/ChangeLog b/dev-python/tlslite/ChangeLog
index 501c52bed378..2d8e7d8fdd65 100644
--- a/dev-python/tlslite/ChangeLog
+++ b/dev-python/tlslite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/tlslite
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tlslite/ChangeLog,v 1.8 2009/10/25 15:44:40 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tlslite/ChangeLog,v 1.9 2009/12/24 18:28:21 arfrever Exp $
+
+*tlslite-0.3.8-r2 (24 Dec 2009)
+
+  24 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -tlslite-0.3.8-r1.ebuild, +tlslite-0.3.8-r2.ebuild,
+  files/tlslite-0.3.8-python25.diff:
+  Fix some generator-related exceptions with Python >=2.5 (bug #262900).
 
   25 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   tlslite-0.3.8-r1.ebuild:
diff --git a/dev-python/tlslite/Manifest b/dev-python/tlslite/Manifest
index 67a5c054e01f..c0c69683612e 100644
--- a/dev-python/tlslite/Manifest
+++ b/dev-python/tlslite/Manifest
@@ -1,5 +1,5 @@
-AUX tlslite-0.3.8-python25.diff 1330 RMD160 318460a4ea349f3501e28e784785c14438a09de3 SHA1 041f54cb956758e4b3681005d83ab3c381a53785 SHA256 1bbb260f539ec7e9070f5ff3d0d19d57f82c044cc3eb3597cf7c9bceb68fa67e
+AUX tlslite-0.3.8-python25.diff 2964 RMD160 cad2d8e1577d618f4c7e54724f50334b6ee7d454 SHA1 9fee444904e3aaad4b93fe0296e424e55286739b SHA256 a95a7e2e61a24b2d3e76c275840e42594276d36a5b37d336066c2b9c9323056b
 DIST tlslite-0.3.8.tar.gz 637558 RMD160 18d1ebcf5891aff97ed1c96af65c54136b0f211b SHA1 56e1a5af611a17e3a59d797922bbf0e9cb13d321 SHA256 3d79170d8c3a662fa717b6401e8004208df113aaf3b18689bbeb704a23bf5b9f
-EBUILD tlslite-0.3.8-r1.ebuild 953 RMD160 d9e5e82785f80e233c974a93742d2ed4558afcdc SHA1 038f9e3886785f93fc183968a1a489d7e370e320 SHA256 f33f42ba1be6f5a9e7fb92a0a6a652f7d3585d99a5e2cb08794ffae7ac6611b7
-MISC ChangeLog 1290 RMD160 0fb86692e3cd3674fe9df780ce73f1947ecd9658 SHA1 5285b181c664e386b9ff5e67d3dc64fcba9d36f9 SHA256 b3ef0b9d6c5e83701608c92c2becc4586eafb35c0b5cd5a65489edef5bbff070
+EBUILD tlslite-0.3.8-r2.ebuild 953 RMD160 c3dce209aeba15a4818628f5b0b0e625846aefb8 SHA1 c5338981a7fea247964c68502b4171c653095c3b SHA256 623820f2bae5a85703f3d60df33300a79d80ba4fbf2c0c6c8d7fb6a4c9c19cb4
+MISC ChangeLog 1561 RMD160 d753324ad4109e8e14ecf1bb7232445714b2c5cf SHA1 352b59311af59fc988840f5bf6f5cd3cb29f0bed SHA256 a3ac7e7b38b72849f24674a8d43f722e1f52f7d2213e2a7fe76099f18552fff0
 MISC metadata.xml 759 RMD160 003d465fb6b8cfbbf32cee20fe87e46f4e8cc2ac SHA1 fbd31cce8b6f2c75337cc397e56fd05c298d0c7d SHA256 c166cc5db84b1555923d8fa758d47a7fe8a5b295771e6fdd2edc75381d412eac
diff --git a/dev-python/tlslite/files/tlslite-0.3.8-python25.diff b/dev-python/tlslite/files/tlslite-0.3.8-python25.diff
index 68ef57128cc1..5b3408b68acb 100644
--- a/dev-python/tlslite/files/tlslite-0.3.8-python25.diff
+++ b/dev-python/tlslite/files/tlslite-0.3.8-python25.diff
@@ -1,6 +1,5 @@
-diff -ru tlslite-0.3.8.orig/tlslite/integration/XMLRPCTransport.py tlslite-0.3.8/tlslite/integration/XMLRPCTransport.py
---- tlslite-0.3.8.orig/tlslite/integration/XMLRPCTransport.py	2008-01-04 14:11:33.046005708 +0100
-+++ tlslite-0.3.8/tlslite/integration/XMLRPCTransport.py	2008-01-04 14:26:41.738737158 +0100
+--- tlslite/integration/XMLRPCTransport.py
++++ tlslite/integration/XMLRPCTransport.py
 @@ -15,7 +15,8 @@
                   cryptoID=None, protocol=None,
                   x509Fingerprint=None,
@@ -27,3 +26,64 @@ diff -ru tlslite-0.3.8.orig/tlslite/integration/XMLRPCTransport.py tlslite-0.3.8
          ClientHelper.__init__(self,
                   username, password, sharedKey,
                   certChain, privateKey,
+--- tlslite/TLSConnection.py
++++ tlslite/TLSConnection.py
+@@ -1545,6 +1545,8 @@
+                         for result in self._sendMsg(alert):
+                             yield result
+                         raise
++            except GeneratorExit:
++                   raise
+             except:
+                     self._shutdown(False)
+                     raise
+@@ -1570,6 +1572,8 @@
+                     raise TLSFaultError(str(alert))
+                 else:
+                     pass
++            except GeneratorExit:
++                raise
+             except:
+                 self._shutdown(False)
+                 raise
+--- tlslite/TLSRecordLayer.py
++++ tlslite/TLSRecordLayer.py
+@@ -218,6 +218,8 @@
+             returnStr = self._readBuffer[:max]
+             self._readBuffer = self._readBuffer[max:]
+             yield returnStr
++        except GeneratorExit:
++            raise
+         except:
+             self._shutdown(False)
+             raise
+@@ -269,6 +271,8 @@
+                     yield result
+                 skipEmptyFrag = True #only send an empy fragment on 1st message
+                 index += 1
++        except GeneratorExit:
++            raise
+         except:
+             self._shutdown(False)
+             raise
+@@ -333,6 +337,8 @@
+                     self._shutdown(True)
+                 else:
+                     raise TLSRemoteAlert(alert)
++            except GeneratorExit:
++                raise
+             except (socket.error, TLSAbruptCloseError):
+                 #If the other side closes the socket, that's okay
+                 self._shutdown(True)
+--- tlslite/utils/compat.py
++++ tlslite/utils/compat.py
+@@ -48,6 +48,9 @@
+         def __iter__(self):
+             return iter(set.values.keys())
+ 
++if sys.version_info < (2,5):
++    class GeneratorExit(Exception):
++        pass
+ 
+ if os.name != "java":
+ 
diff --git a/dev-python/tlslite/tlslite-0.3.8-r1.ebuild b/dev-python/tlslite/tlslite-0.3.8-r2.ebuild
index 62a02f02ea77..3b27ee0791fd 100644
--- a/dev-python/tlslite/tlslite-0.3.8-r1.ebuild
+++ b/dev-python/tlslite/tlslite-0.3.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tlslite/tlslite-0.3.8-r1.ebuild,v 1.2 2009/10/25 15:44:40 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tlslite/tlslite-0.3.8-r2.ebuild,v 1.1 2009/12/24 18:28:21 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"