From 662aed784218a45efbf563ff6150fcb9f1aa81aa Mon Sep 17 00:00:00 2001 From: "Kali Kaneko (leap communications)" Date: Thu, 1 Sep 2016 00:12:28 -0400 Subject: [refactor] fix imports after merging submodules --- src/leap/bitmask/mail/testing/__init__.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/leap/bitmask/mail/testing/__init__.py') diff --git a/src/leap/bitmask/mail/testing/__init__.py b/src/leap/bitmask/mail/testing/__init__.py index 8822a5c..b5a2a42 100644 --- a/src/leap/bitmask/mail/testing/__init__.py +++ b/src/leap/bitmask/mail/testing/__init__.py @@ -24,12 +24,9 @@ from twisted.internet.defer import gatherResults from twisted.trial import unittest from twisted.internet import defer - -from leap.soledad.client import Soledad -from leap.keymanager import KeyManager - - from leap.common.testing.basetest import BaseLeapTest +from leap.bitmask.keymanager import KeyManager +from leap.soledad.client import Soledad ADDRESS = 'leap@leap.se' ADDRESS_2 = 'anotheruser@leap.se' -- cgit v1.2.3