summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-06-18 14:32:16 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-06-18 14:32:16 -0300
commit418621eba5739c4de2dabc91b0927e4f1a188dc9 (patch)
treefa666163102feba8ace65c815c655098574fac02 /src
parent4ff7ef29b06b6609c3fbb75ef6a17f500b106025 (diff)
Move backend to its own namespace.
Diffstat (limited to 'src')
-rw-r--r--src/leap/bitmask/backend/__init__.py0
-rw-r--r--src/leap/bitmask/backend/leapbackend.py (renamed from src/leap/bitmask/backend.py)1
-rw-r--r--src/leap/bitmask/gui/mainwindow.py4
3 files changed, 3 insertions, 2 deletions
diff --git a/src/leap/bitmask/backend/__init__.py b/src/leap/bitmask/backend/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/leap/bitmask/backend/__init__.py
diff --git a/src/leap/bitmask/backend.py b/src/leap/bitmask/backend/leapbackend.py
index 5748c4c6..b0e9cc01 100644
--- a/src/leap/bitmask/backend.py
+++ b/src/leap/bitmask/backend/leapbackend.py
@@ -289,6 +289,7 @@ class Provider(object):
self._signaler.PROV_GET_PINNED_PROVIDERS,
PinnedProviders.domains())
+
class Register(object):
"""
Interfaces with setup and bootstrapping operations for a provider
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 03c29d0e..11b9acf1 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -42,7 +42,7 @@ from leap.bitmask.gui import twisted_main
from leap.bitmask.platform_init import IS_WIN, IS_MAC, IS_LINUX
from leap.bitmask.platform_init.initializers import init_platform
-from leap.bitmask import backend
+from leap.bitmask.backend import leapbackend
from leap.bitmask.services.eip import conductor as eip_conductor
from leap.bitmask.services.mail import conductor as mail_conductor
@@ -118,7 +118,7 @@ class MainWindow(QtGui.QMainWindow):
self.ui = Ui_MainWindow()
self.ui.setupUi(self)
self.menuBar().setNativeMenuBar(not IS_LINUX)
- self._backend = backend.Backend(bypass_checks)
+ self._backend = leapbackend.Backend(bypass_checks)
self._backend.start()
self._settings = LeapSettings()