Changeset 265

Timestamp:

10/31/13 22:44:46 (11 years ago)

Author:

atzm

Message:

correspond with libraries version bump

Location:

etherws/trunk

Files:

• etherws.py (modified) (4 diffs)
• setup.py (modified) (1 diff)

etherws/trunk/etherws.py

@@ -5 +5 @@
 #
 # depends on:
-#   - python-2.7.2
-#   - python-pytun-0.2
-#   - websocket-client-0.7.0
-#   - tornado-2.3
+#   - python-2.7.5
+#   - python-pytun-2.1
+#   - websocket-client-0.12.0
+#   - tornado-2.4
 #
 # ===========================================================================
@@ -682 +682 @@
         super(ClientHandler, self).__init__(*args, **kwargs)
 
-        self._ssl = kwargs.get('ssl', False)
+        self._sslopt = kwargs.get('sslopt', {})
         self._options = {}
 
@@ -693 +693 @@
 
     def open(self):
-        sslwrap = websocket._SSLSocketWrapper
-
         if not self.closed:
             raise websocket.WebSocketException('Already opened')
 
-        if self._ssl:
-            websocket._SSLSocketWrapper = self._ssl
-
         # XXX: may be blocked
-        try:
-            self.register_device(websocket.WebSocket())
-            self.device.connect(self.target, **self._options)
-            self.dprintf('connected: %s\n', lambda: self.target)
-            return self.join_switch()
-        finally:
-            websocket._SSLSocketWrapper = sslwrap
-
-    def fileno(self):
-        if self.closed:
-            raise websocket.WebSocketException('Closed socket')
-        return self.device.io_sock.fileno()
+        self.register_device(websocket.WebSocket(sslopt=self._sslopt))
+        self.device.connect(self.target, **self._options)
+        self.dprintf('connected: %s\n', lambda: self.target)
+        return self.join_switch()
 
     def write_message(self, message, binary=False):
@@ -854 +841 @@
 
     def _optparse_client(self, opt):
-        args = {'cert_reqs': ssl.CERT_REQUIRED, 'ca_certs': opt.get('cacerts')}
         if opt.get('insecure'):
-            args = {}
-        ssl_ = lambda sock: ssl.wrap_socket(sock, **args)
+            sslopt = {}
+        else:
+            sslopt = {'cert_reqs': ssl.CERT_REQUIRED,
+                      'ca_certs':  opt.get('cacerts')}
         cred = {'user': opt.get('user'), 'passwd': opt.get('passwd')}
-        return {'ssl': ssl_, 'cred': cred}
+        return {'sslopt': sslopt, 'cred': cred}
 
     def _jsonrpc_response(self, id_=None, result=None, error=None):

etherws/trunk/setup.py

@@ -48 +48 @@
     platforms=['Linux'],
     install_requires=[
-        'python-pytun>=0.2',
-        'websocket-client>=0.7.0',
-        'tornado>=2.3',
+        'python-pytun>=2.1',
+        'websocket-client>=0.12.0',
+        'tornado>=2.4',
     ],
     classifiers=[