summaryrefslogtreecommitdiff
path: root/src/leap/base/connection.py
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-08-21 01:18:29 +0900
committerkali <kali@leap.se>2012-08-21 01:18:29 +0900
commitd3a37a630fe0f8355ec76a007801b3b0cb01bfc2 (patch)
tree9d6d5ccdee8062cc9b8fcc2a8d417ced70b8cc25 /src/leap/base/connection.py
parent451189d369f6661a67a1692945e68b5128cb9a65 (diff)
pep8 cleaning
Diffstat (limited to 'src/leap/base/connection.py')
-rw-r--r--src/leap/base/connection.py18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/leap/base/connection.py b/src/leap/base/connection.py
index 6534560b..6e5086b3 100644
--- a/src/leap/base/connection.py
+++ b/src/leap/base/connection.py
@@ -3,23 +3,26 @@ Base Connection Classs
"""
from __future__ import (division, unicode_literals, print_function)
#import threading
-from functools import partial
+#from functools import partial
import logging
-from leap.utils.coroutines import spawn_and_watch_process
-from leap.baseapp.config import get_config, get_vpn_stdout_mockup
-from leap.eip.vpnwatcher import EIPConnectionStatus, status_watcher
-from leap.eip.vpnmanager import OpenVPNManager, ConnectionRefusedError
+#from leap.utils.coroutines import spawn_and_watch_process
+#from leap.baseapp.config import get_config, get_vpn_stdout_mockup
+#from leap.eip.vpnwatcher import EIPConnectionStatus, status_watcher
+from leap.eip.vpnmanager import ConnectionRefusedError
-from leap.Configuration import Configuration
-from leap.Authentication import Authentication
+from leap.configuration import Configuration
+from leap.authentication import Authentication
logger = logging.getLogger(name=__name__)
+
class Connection(Configuration, Authentication):
def __init__(self, *args, **kwargs):
self.connection_state = None
self.desired_connection_state = None
+ #XXX FIXME this is only initializing one
+ #of the bases..
super(Connection, self).__init__(*args, **kwargs)
def connect(self):
@@ -108,7 +111,6 @@ class Connection(Configuration, Authentication):
logger.error("Failed Connection: %s" %
unicode(except_msg))
return conn_result
-
class ConnectionError(Exception):