diff -u -r -b -B /cygdrive/c/frank/py25/lib/site-packages/cherrypy-3.1.0beta3-py2.5.egg/cherrypy/wsgiserver/__init__.py cherrypy/wsgiserver/__init__.py --- /cygdrive/c/frank/py25/lib/site-packages/cherrypy-3.1.0beta3-py2.5.egg/cherrypy/wsgiserver/__init__.py 2008-04-12 11:38:07.491289000 -0500 +++ cherrypy/wsgiserver/__init__.py 2008-04-12 22:10:28.959800000 -0500 @@ -57,11 +57,7 @@ from urllib import unquote from urlparse import urlparse -try: - from OpenSSL import SSL - from OpenSSL import crypto -except ImportError: - SSL = None +SSL = None import errno socket_errors_to_ignore = [] @@ -676,21 +672,6 @@ raise socket.timeout("timed out") return ssl_method_wrapper -class SSL_fileobject(socket._fileobject): - """Faux file object attached to a socket object.""" - - ssl_timeout = 3 - ssl_retry = .01 - - close = _ssl_wrap_method(socket._fileobject.close) - flush = _ssl_wrap_method(socket._fileobject.flush) - write = _ssl_wrap_method(socket._fileobject.write) - writelines = _ssl_wrap_method(socket._fileobject.writelines) - read = _ssl_wrap_method(socket._fileobject.read, is_reader=True) - readline = _ssl_wrap_method(socket._fileobject.readline, is_reader=True) - readlines = _ssl_wrap_method(socket._fileobject.readlines, is_reader=True) - - class HTTPConnection(object): """An HTTP connection (active socket).