Changeset 281

Timestamp:

06/25/15 18:59:54 (9 years ago)

Author:

atzm

Message:

• refactoring

File:

• etherws/trunk/etherws.py (modified) (2 diffs)

etherws/trunk/etherws.py

@@ -695 +695 @@
     def __init__(self, *args, **kwargs):
         super(ClientHandler, self).__init__(*args, **kwargs)
-
-        self._sslopt = kwargs.get('sslopt', {})
-        self._options = self._getproxy()
-
-        cred = kwargs.get('cred', None)
-
-        if isinstance(cred, dict) and cred['user'] and cred['passwd']:
-            token = base64.b64encode('%s:%s' % (cred['user'], cred['passwd']))
-            auth = ['Authorization: Basic %s' % token]
-            self._options['header'] = auth
+        self._sslopt = self._kwargs.get('sslopt', {})
+        self._options = dict(self.authopts, **self.proxyopts)
 
     def open(self):
@@ -730 +722 @@
         return self.device.recv()
 
-    def _getproxy(self):
+    @property
+    def authopts(self):
+        cred = self._kwargs.get('cred')
+
+        if not isinstance(cred, dict):
+            return {}
+        if 'user' not in cred:
+            return {}
+        if 'passwd' not in cred:
+            return {}
+
+        token = base64.b64encode('%s:%s' % (cred['user'], cred['passwd']))
+        return {'header': ['Authorization: Basic %s' % token]}
+
+    @property
+    def proxyopts(self):
         scheme, remain = urllib2.splittype(self.target)