[Commits] (heikki) Twisted requires copyright assignments to their project leader.

commits at osafoundation.org commits at osafoundation.org
Wed Aug 11 12:18:47 PDT 2004 

Commit by: heikki
Modified files:
external/twisted/m2-patches 1.5 1.6

Log message:
Twisted requires copyright assignments to their project leader.

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/twisted/m2-patches.diff?r1=text&tr1=1.5&r2=text&tr2=1.6

Index: external/twisted/m2-patches
diff -u external/twisted/m2-patches:1.5 external/twisted/m2-patches:1.6
--- external/twisted/m2-patches:1.5	Wed Aug 11 11:50:48 2004
+++ external/twisted/m2-patches	Wed Aug 11 12:18:45 2004
@@ -2,9 +2,9 @@
 ===================================================================
 --- twisted/internet/m2ssl.py	(revision 0)
 +++ twisted/internet/m2ssl.py	(revision 0)
-@@ -0,0 +1,123 @@
-+# Copyright (C) 2004 Open Source Applications Foundation
-+# Auhor: Heikki Toivonen (heikki at osafoundation.org)
+@@ -0,0 +1,134 @@
++# Twisted, the Framework of Your Internet
++# Copyright (C) 2001 Matthew W. Lefkowitz
 +#
 +# This library is free software; you can redistribute it and/or
 +# modify it under the terms of version 2.1 of the GNU Lesser General Public
@@ -19,6 +19,17 @@
 +# License along with this library; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 +
++"""Adapters for M2Crypto's SSL.Connection and SSL.Context
++
++Requires M2Crypto (http://sandbox.rulemaker.net/ngps/m2/).
++To use M2Crypto, set the optional 'useM2' parameter to True when creating
++the SSL context factories (see twisted.internet.ssl).
++
++API Stability: unstable
++
++Author: U{Heikki Toivonen<mailto:heikki at osafoundation.org>}
++"""
++
 +# Import with different names so that we can call the base class methods.
 +from M2Crypto.SSL import Connection as M2Connection
 +from M2Crypto.SSL import Context as M2Context
@@ -130,17 +141,7 @@
 ===================================================================
 --- twisted/internet/ssl.py	(revision 11245)
 +++ twisted/internet/ssl.py	(working copy)
-@@ -2,6 +2,9 @@
- # Twisted, the Framework of Your Internet
- # Copyright (C) 2001 Matthew W. Lefkowitz
- #
-+# M2Crypto portions Copyright (C) 2004 Open Source Applications Foundation
-+# Auhor: Heikki Toivonen (heikki at osafoundation.org)
-+#
- # This library is free software; you can redistribute it and/or
- # modify it under the terms of version 2.1 of the GNU Lesser General Public
- # License as published by the Free Software Foundation.
-@@ -15,8 +18,13 @@
+@@ -15,8 +15,13 @@
  # License along with this library; if not, write to the Free Software
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
@@ -155,7 +156,7 @@
  SSL connections require a ContextFactory so they can create SSL contexts.
  End users should only use the ContextFactory classes directly - for SSL
  connections use the reactor.connectSSL/listenSSL and so on, as documented
-@@ -44,7 +52,27 @@
+@@ -44,7 +49,27 @@
  supported = False
  
  # System imports
@@ -184,7 +185,7 @@
  import socket
  from zope.interface import implements, implementsOnly, implementedBy
  
-@@ -60,6 +88,7 @@
+@@ -60,6 +85,7 @@
      """A factory for SSL context objects, for server SSL connections."""
  
      isClient = 0
@@ -192,7 +193,7 @@
  
      def getContext(self):
          """Return a SSL.Context object. override in subclasses."""
-@@ -69,16 +98,23 @@
+@@ -69,16 +95,23 @@
  class DefaultOpenSSLContextFactory(ContextFactory):
  
      def __init__(self, privateKeyFileName, certificateFileName,
@@ -220,7 +221,7 @@
          self._context = ctx
  
      def __getstate__(self):
-@@ -100,9 +136,17 @@
+@@ -100,9 +133,17 @@
      """A context factory for SSL clients."""
  
      isClient = 1
@@ -239,7 +240,7 @@
          return SSL.Context(self.method)
  
  
-@@ -161,16 +205,23 @@
+@@ -161,16 +202,23 @@
          tcp.Port.__init__(self, port, factory, backlog, interface, reactor)
          self.ctxFactory = ctxFactory
  
@@ -268,17 +269,7 @@
 ===================================================================
 --- twisted/internet/abstract.py	(revision 11245)
 +++ twisted/internet/abstract.py	(working copy)
-@@ -1,6 +1,9 @@
- # Twisted, the Framework of Your Internet
- # Copyright (C) 2001 Matthew W. Lefkowitz
- #
-+# M2Crypto portions Copyright (C) 2004 Open Source Applications Foundation
-+# Auhor: Heikki Toivonen (heikki at osafoundation.org)
-+#
- # This library is free software; you can redistribute it and/or
- # modify it under the terms of version 2.1 of the GNU Lesser General Public
- # License as published by the Free Software Foundation.
-@@ -144,7 +147,13 @@
+@@ -144,7 +144,13 @@
              return
          if data:
              if (not self.dataBuffer) and (self.producer is None):
@@ -297,17 +288,7 @@
 ===================================================================
 --- twisted/internet/tcp.py	(revision 11245)
 +++ twisted/internet/tcp.py	(working copy)
-@@ -2,6 +2,9 @@
- # Twisted, the Framework of Your Internet
- # Copyright (C) 2001 Matthew W. Lefkowitz
- #
-+# M2Crypto portions Copyright (C) 2004 Open Source Applications Foundation
-+# Auhor: Heikki Toivonen (heikki at osafoundation.org)
-+#
- # This library is free software; you can redistribute it and/or
- # modify it under the terms of version 2.1 of the GNU Lesser General Public
- # License as published by the Free Software Foundation.
-@@ -40,11 +43,31 @@
+@@ -40,11 +40,31 @@
      fcntl = None
  from zope.interface import implements, classImplements
  
@@ -339,7 +320,7 @@
  if os.name == 'nt':
      # we hardcode these since windows actually wants e.g.
      # WSAEALREADY rather than EALREADY. Possibly we should
-@@ -115,6 +138,9 @@
+@@ -115,6 +135,9 @@
          except SSL.Error:
              log.err()
              return main.CONNECTION_LOST
@@ -349,7 +330,7 @@
  
      def loseConnection(self):
          Connection.loseConnection(self)
-@@ -151,6 +177,9 @@
+@@ -151,6 +174,9 @@
          except SSL.Error:
              log.err()
              return main.CONNECTION_LOST
@@ -359,7 +340,7 @@
  
      def _closeSocket(self):
          try:
-@@ -204,20 +233,28 @@
+@@ -204,20 +230,28 @@
          self.socket.setblocking(0)
          self.fileno = skt.fileno
          self.protocol = protocol
@@ -392,7 +373,7 @@
              klass = self.__class__
              class TLSConnection(_TLSMixin, klass):
                  implements(interfaces.ISSLTransport)
-@@ -251,6 +288,14 @@
+@@ -251,6 +285,14 @@
              if retval == -1 and desc == 'Unexpected EOF':
                  return main.CONNECTION_DONE
              raise
@@ -411,17 +392,7 @@
 ===================================================================
 --- twisted/mail/protocols.py	(revision 11245)
 +++ twisted/mail/protocols.py	(working copy)
-@@ -2,6 +2,9 @@
- # Twisted, the Framework of Your Internet
- # Copyright (C) 2001-2002 Matthew W. Lefkowitz
- #
-+# M2Crypto portions Copyright (C) 2004 Open Source Applications Foundation
-+# Auhor: Heikki Toivonen (heikki at osafoundation.org)
-+#
- # This library is free software; you can redistribute it and/or
- # modify it under the terms of version 2.1 of the GNU Lesser General Public
- # License as published by the Free Software Foundation.
-@@ -221,13 +224,20 @@
+@@ -221,13 +221,20 @@
      
      This loads a certificate and private key from a specified file.
      """

More information about the Commits mailing list