summaryrefslogtreecommitdiff
path: root/src/leap/base/connection.py
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-08-30 04:37:30 +0900
committerkali <kali@leap.se>2012-08-30 04:37:30 +0900
commit5e77b77765154850fb708e6ea188fcf7ba99fdce (patch)
treeae81cd0287c5435414bd2b9fff3f18664a835489 /src/leap/base/connection.py
parentd69976caa5070403f81799c79be974241cff7f70 (diff)
add test for JSONLeapConfig metaclass
Diffstat (limited to 'src/leap/base/connection.py')
-rw-r--r--src/leap/base/connection.py15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/leap/base/connection.py b/src/leap/base/connection.py
index 9cdc33fa..f594d21c 100644
--- a/src/leap/base/connection.py
+++ b/src/leap/base/connection.py
@@ -5,18 +5,25 @@ from __future__ import (division, unicode_literals, print_function)
import logging
-from leap.base.config import JSONLeapConfig
+#from leap.base.config import JSONLeapConfig
from leap.base.authentication import Authentication
logger = logging.getLogger(name=__name__)
-class Connection(JSONLeapConfig, Authentication):
+class Connection(Authentication):
+ # JSONLeapConfig
+ #spec = {}
+
def __init__(self, *args, **kwargs):
self.connection_state = None
self.desired_connection_state = None
- #XXX FIXME this is only initializing one
- #of the bases..
+ #XXX FIXME diamond inheritance gotcha..
+ #If you inherit from >1 class,
+ #super is only initializing one
+ #of the bases..!!
+ # I think we better pass config as a constructor
+ # parameter -- kali 2012-08-30 04:33
super(Connection, self).__init__(*args, **kwargs)
def connect(self):