Merge pull request scylladb#31 from riptano/python-1094

PYTHON-1094

Author: aboudreault

cassandra/connection.py

@@ -26,11 +26,7 @@
 import sys
 from threading import Thread, Event, RLock, Condition
 import time
-
-try:
-    import ssl
-except ImportError:
-    ssl = None  # NOQA
+import ssl
 
 if 'gevent.monkey' in sys.modules:
     from gevent.queue import Queue, Empty

cassandra/io/asyncorereactor.py

@@ -22,6 +22,7 @@
 import time
 import weakref
 import sys
+import ssl
 
 from six.moves import range
 
@@ -32,11 +33,6 @@
 
 import asyncore
 
-try:
-    import ssl
-except ImportError:
-    ssl = None  # NOQA
-
 from cassandra.connection import Connection, ConnectionShutdown, NONBLOCKING, Timer, TimerManager
 
 log = logging.getLogger(__name__)
@@ -424,7 +420,7 @@ def handle_read(self):
                 if len(buf) < self.in_buffer_size:
                     break
         except socket.error as err:
-            if ssl and isinstance(err, ssl.SSLError):
+            if isinstance(err, ssl.SSLError):
                 if err.args[0] in (ssl.SSL_ERROR_WANT_READ, ssl.SSL_ERROR_WANT_WRITE):
                     if not self._iobuf.tell():
                         return

cassandra/io/libevreactor.py

@@ -343,7 +343,7 @@ def handle_read(self, watcher, revents, errno=None):
                 if len(buf) < self.in_buffer_size:
                     break
         except socket.error as err:
-            if ssl and isinstance(err, ssl.SSLError):
+            if isinstance(err, ssl.SSLError):
                 if err.args[0] in (ssl.SSL_ERROR_WANT_READ, ssl.SSL_ERROR_WANT_WRITE):
                     if not self._iobuf.tell():
                         return