diff options
| author | kali <kali@leap.se> | 2012-08-21 04:58:05 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-08-21 05:00:53 +0900 |
| commit | 738b4bf8c6b75a1d73b7fa3e1a5edb69adf9d8a0 (patch) | |
| tree | 9870139b5fcb5866a2e50c118498e2380276bce4 /src/leap/eip/eipconnection.py | |
| parent | bb7c03a2d7244beff71ae610c012f525496daeb9 (diff) | |
fix out-of-sync refactor.
manually merge changes from the develop branch that were lost due
to having branched a previous state when refactored former "conductor"
class.
also, moved more exceptions to its own file.
Diffstat (limited to 'src/leap/eip/eipconnection.py')
| -rw-r--r-- | src/leap/eip/eipconnection.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/leap/eip/eipconnection.py b/src/leap/eip/eipconnection.py index 7e6c4038..139ee750 100644 --- a/src/leap/eip/eipconnection.py +++ b/src/leap/eip/eipconnection.py @@ -8,8 +8,7 @@ logger = logging.getLogger(name=__name__) from leap.base.connection import ConnectionError from leap.eip import exceptions as eip_exceptions -from leap.eip.openvpnconnection import ( - OpenVPNConnection, ConnectionRefusedError) +from leap.eip.openvpnconnection import OpenVPNConnection class EIPConnection(OpenVPNConnection): @@ -25,7 +24,7 @@ class EIPConnection(OpenVPNConnection): self.settingsfile = kwargs.get('settingsfile', None) self.logfile = kwargs.get('logfile', None) self.error_queue = [] - self.desired_con_state = None # ??? + #self.desired_con_state = None # not in use status_signals = kwargs.pop('status_signals', None) self.status = EIPConnectionStatus(callbacks=status_signals) @@ -70,7 +69,7 @@ class EIPConnection(OpenVPNConnection): """ try: state = self.get_connection_state() - except ConnectionRefusedError: + except eip_exceptions.ConnectionRefusedError: # connection refused. might be not ready yet. return if not state: |