[gentoo-commits] gentoo-x86 commit in dev-python/tlslite/files: tlslite-0.3.8-python25.diff

[gentoo-commits] gentoo-x86 commit in dev-python/tlslite/files: tlslite-0.3.8-python25.diff

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    09/12/24 18:28:21

  Modified:             tlslite-0.3.8-python25.diff
  Log:
  Fix some generator-related exceptions with Python >=2.5 (bug #262900).
  (Portage version: 15152-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-python/tlslite/files/tlslite-0.3.8-python25.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/tlslite/files/tlslite-0.3.8-python25.diff?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/tlslite/files/tlslite-0.3.8-python25.diff?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/tlslite/files/tlslite-0.3.8-python25.diff?r1=1.1&r2=1.2

Index: tlslite-0.3.8-python25.diff
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/tlslite/files/tlslite-0.3.8-python25.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tlslite-0.3.8-python25.diff	5 Jan 2008 22:00:34 -0000	1.1
+++ tlslite-0.3.8-python25.diff	24 Dec 2009 18:28:21 -0000	1.2
@@ -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 @@
          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":
+ 

[gentoo-commits] gentoo-x86 commit in dev-python/tlslite/files: tlslite-0.3.8-python25.diff

[Pacho Ramos (pacho)]

pacho       13/07/21 08:52:51

  Removed:              tlslite-0.3.8-python25.diff
  Log:
  Cleanup due #92799
  
  (Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)