move everything into bitmask namespace

80 files changed, 20 insertions, 0 deletions

diff --git a/src/leap/bitmask/__init__.py b/src/leap/bitmask/__init__.py
new file mode 100644
index 00000000..f48ad105
--- /dev/null
+++ b/src/leap/bitmask/__init__.py
@@ -0,0 +1,6 @@
+# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
+try:
+    __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)
diff --git a/src/leap/_version.py b/src/leap/bitmask/_version.py
index 05542975..05542975 100644
--- a/src/leap/_version.py
+++ b/src/leap/bitmask/_version.py
diff --git a/src/leap/app.py b/src/leap/bitmask/app.py
index 22340d4d..22340d4d 100644
--- a/src/leap/app.py
+++ b/src/leap/bitmask/app.py
diff --git a/src/leap/config/__init__.py b/src/leap/bitmask/config/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/config/__init__.py
+++ b/src/leap/bitmask/config/__init__.py
diff --git a/src/leap/config/leapsettings.py b/src/leap/bitmask/config/leapsettings.py
index 35010280..35010280 100644
--- a/src/leap/config/leapsettings.py
+++ b/src/leap/bitmask/config/leapsettings.py
diff --git a/src/leap/config/provider_spec.py b/src/leap/bitmask/config/provider_spec.py
index cf942c7b..cf942c7b 100644
--- a/src/leap/config/provider_spec.py
+++ b/src/leap/bitmask/config/provider_spec.py
diff --git a/src/leap/config/providerconfig.py b/src/leap/bitmask/config/providerconfig.py
index f899b17c..f899b17c 100644
--- a/src/leap/config/providerconfig.py
+++ b/src/leap/bitmask/config/providerconfig.py
diff --git a/src/leap/config/tests/test_providerconfig.py b/src/leap/bitmask/config/tests/test_providerconfig.py
index ff2828e6..ff2828e6 100644
--- a/src/leap/config/tests/test_providerconfig.py
+++ b/src/leap/bitmask/config/tests/test_providerconfig.py
diff --git a/src/leap/crypto/__init__.py b/src/leap/bitmask/crypto/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/crypto/__init__.py
+++ b/src/leap/bitmask/crypto/__init__.py
diff --git a/src/leap/crypto/srpauth.py b/src/leap/bitmask/crypto/srpauth.py
index fc0533fc..fc0533fc 100644
--- a/src/leap/crypto/srpauth.py
+++ b/src/leap/bitmask/crypto/srpauth.py
diff --git a/src/leap/crypto/srpregister.py b/src/leap/bitmask/crypto/srpregister.py
index de1978b5..de1978b5 100644
--- a/src/leap/crypto/srpregister.py
+++ b/src/leap/bitmask/crypto/srpregister.py
diff --git a/src/leap/crypto/tests/__init__.py b/src/leap/bitmask/crypto/tests/__init__.py
index 7f118735..7f118735 100644
--- a/src/leap/crypto/tests/__init__.py
+++ b/src/leap/bitmask/crypto/tests/__init__.py
diff --git a/src/leap/crypto/tests/eip-service.json b/src/leap/bitmask/crypto/tests/eip-service.json
index 24df42a2..24df42a2 100644
--- a/src/leap/crypto/tests/eip-service.json
+++ b/src/leap/bitmask/crypto/tests/eip-service.json
diff --git a/src/leap/crypto/tests/fake_provider.py b/src/leap/bitmask/crypto/tests/fake_provider.py
index 54af485d..54af485d 100755
--- a/src/leap/crypto/tests/fake_provider.py
+++ b/src/leap/bitmask/crypto/tests/fake_provider.py
diff --git a/src/leap/crypto/tests/openvpn.pem b/src/leap/bitmask/crypto/tests/openvpn.pem
index a95e9370..a95e9370 100644
--- a/src/leap/crypto/tests/openvpn.pem
+++ b/src/leap/bitmask/crypto/tests/openvpn.pem
diff --git a/src/leap/crypto/tests/test_provider.json b/src/leap/bitmask/crypto/tests/test_provider.json
index c37bef8f..c37bef8f 100644
--- a/src/leap/crypto/tests/test_provider.json
+++ b/src/leap/bitmask/crypto/tests/test_provider.json
diff --git a/src/leap/crypto/tests/test_srpauth.py b/src/leap/bitmask/crypto/tests/test_srpauth.py
index e3258fd3..e3258fd3 100644
--- a/src/leap/crypto/tests/test_srpauth.py
+++ b/src/leap/bitmask/crypto/tests/test_srpauth.py
diff --git a/src/leap/crypto/tests/test_srpregister.py b/src/leap/bitmask/crypto/tests/test_srpregister.py
index 66b815f2..66b815f2 100644
--- a/src/leap/crypto/tests/test_srpregister.py
+++ b/src/leap/bitmask/crypto/tests/test_srpregister.py
diff --git a/src/leap/crypto/tests/wrongcert.pem b/src/leap/bitmask/crypto/tests/wrongcert.pem
index e6cff38a..e6cff38a 100644
--- a/src/leap/crypto/tests/wrongcert.pem
+++ b/src/leap/bitmask/crypto/tests/wrongcert.pem
diff --git a/src/leap/gui/__init__.py b/src/leap/bitmask/gui/__init__.py
index 4b289442..4b289442 100644
--- a/src/leap/gui/__init__.py
+++ b/src/leap/bitmask/gui/__init__.py
diff --git a/src/leap/gui/loggerwindow.py b/src/leap/bitmask/gui/loggerwindow.py
index fcbdbf19..fcbdbf19 100644
--- a/src/leap/gui/loggerwindow.py
+++ b/src/leap/bitmask/gui/loggerwindow.py
diff --git a/src/leap/gui/login.py b/src/leap/bitmask/gui/login.py
index de0b2d50..de0b2d50 100644
--- a/src/leap/gui/login.py
+++ b/src/leap/bitmask/gui/login.py
diff --git a/src/leap/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 5ace1043..5ace1043 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
diff --git a/src/leap/gui/statuspanel.py b/src/leap/bitmask/gui/statuspanel.py
index f3424c7c..f3424c7c 100644
--- a/src/leap/gui/statuspanel.py
+++ b/src/leap/bitmask/gui/statuspanel.py
diff --git a/src/leap/gui/twisted_main.py b/src/leap/bitmask/gui/twisted_main.py
index c7add3ee..c7add3ee 100644
--- a/src/leap/gui/twisted_main.py
+++ b/src/leap/bitmask/gui/twisted_main.py
diff --git a/src/leap/gui/ui/loggerwindow.ui b/src/leap/bitmask/gui/ui/loggerwindow.ui
index b08428a9..b08428a9 100644
--- a/src/leap/gui/ui/loggerwindow.ui
+++ b/src/leap/bitmask/gui/ui/loggerwindow.ui
diff --git a/src/leap/gui/ui/login.ui b/src/leap/bitmask/gui/ui/login.ui
index 42a6897a..42a6897a 100644
--- a/src/leap/gui/ui/login.ui
+++ b/src/leap/bitmask/gui/ui/login.ui
diff --git a/src/leap/gui/ui/mainwindow.ui b/src/leap/bitmask/gui/ui/mainwindow.ui
index ecd3cbe9..ecd3cbe9 100644
--- a/src/leap/gui/ui/mainwindow.ui
+++ b/src/leap/bitmask/gui/ui/mainwindow.ui
diff --git a/src/leap/gui/ui/statuspanel.ui b/src/leap/bitmask/gui/ui/statuspanel.ui
index 3482ac7c..3482ac7c 100644
--- a/src/leap/gui/ui/statuspanel.ui
+++ b/src/leap/bitmask/gui/ui/statuspanel.ui
diff --git a/src/leap/gui/ui/wizard.ui b/src/leap/bitmask/gui/ui/wizard.ui
index a8f66bbc..a8f66bbc 100644
--- a/src/leap/gui/ui/wizard.ui
+++ b/src/leap/bitmask/gui/ui/wizard.ui
diff --git a/src/leap/gui/wizard.py b/src/leap/bitmask/gui/wizard.py
index 2b48fc81..2b48fc81 100644
--- a/src/leap/gui/wizard.py
+++ b/src/leap/bitmask/gui/wizard.py
diff --git a/src/leap/gui/wizardpage.py b/src/leap/bitmask/gui/wizardpage.py
index b2a00028..b2a00028 100644
--- a/src/leap/gui/wizardpage.py
+++ b/src/leap/bitmask/gui/wizardpage.py
diff --git a/src/leap/platform_init/__init__.py b/src/leap/bitmask/platform_init/__init__.py
index 2a262a30..2a262a30 100644
--- a/src/leap/platform_init/__init__.py
+++ b/src/leap/bitmask/platform_init/__init__.py
diff --git a/src/leap/platform_init/initializers.py b/src/leap/bitmask/platform_init/initializers.py
index 46488250..46488250 100644
--- a/src/leap/platform_init/initializers.py
+++ b/src/leap/bitmask/platform_init/initializers.py
diff --git a/src/leap/platform_init/locks.py b/src/leap/bitmask/platform_init/locks.py
index 39b18648..39b18648 100644
--- a/src/leap/platform_init/locks.py
+++ b/src/leap/bitmask/platform_init/locks.py
diff --git a/src/leap/provider/__init__.py b/src/leap/bitmask/provider/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/provider/__init__.py
+++ b/src/leap/bitmask/provider/__init__.py
diff --git a/src/leap/provider/supportedapis.py b/src/leap/bitmask/provider/supportedapis.py
index 3e650ba2..3e650ba2 100644
--- a/src/leap/provider/supportedapis.py
+++ b/src/leap/bitmask/provider/supportedapis.py
diff --git a/src/leap/services/__init__.py b/src/leap/bitmask/services/__init__.py
index 253359cd..253359cd 100644
--- a/src/leap/services/__init__.py
+++ b/src/leap/bitmask/services/__init__.py
diff --git a/src/leap/services/abstractbootstrapper.py b/src/leap/bitmask/services/abstractbootstrapper.py
index 9e50948c..9e50948c 100644
--- a/src/leap/services/abstractbootstrapper.py
+++ b/src/leap/bitmask/services/abstractbootstrapper.py
diff --git a/src/leap/services/eip/__init__.py b/src/leap/bitmask/services/eip/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/services/eip/__init__.py
+++ b/src/leap/bitmask/services/eip/__init__.py
diff --git a/src/leap/services/eip/eipbootstrapper.py b/src/leap/bitmask/services/eip/eipbootstrapper.py
index 1d7bc342..1d7bc342 100644
--- a/src/leap/services/eip/eipbootstrapper.py
+++ b/src/leap/bitmask/services/eip/eipbootstrapper.py
diff --git a/src/leap/services/eip/eipconfig.py b/src/leap/bitmask/services/eip/eipconfig.py
index d69e1fd8..d69e1fd8 100644
--- a/src/leap/services/eip/eipconfig.py
+++ b/src/leap/bitmask/services/eip/eipconfig.py
diff --git a/src/leap/services/eip/eipspec.py b/src/leap/bitmask/services/eip/eipspec.py
index 9cc56be3..9cc56be3 100644
--- a/src/leap/services/eip/eipspec.py
+++ b/src/leap/bitmask/services/eip/eipspec.py
diff --git a/src/leap/services/eip/providerbootstrapper.py b/src/leap/bitmask/services/eip/providerbootstrapper.py
index bf5938dc..bf5938dc 100644
--- a/src/leap/services/eip/providerbootstrapper.py
+++ b/src/leap/bitmask/services/eip/providerbootstrapper.py
diff --git a/src/leap/services/eip/tests/__init__.py b/src/leap/bitmask/services/eip/tests/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/services/eip/tests/__init__.py
+++ b/src/leap/bitmask/services/eip/tests/__init__.py
diff --git a/src/leap/services/eip/tests/test_eipbootstrapper.py b/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py
index f2331eca..f2331eca 100644
--- a/src/leap/services/eip/tests/test_eipbootstrapper.py
+++ b/src/leap/bitmask/services/eip/tests/test_eipbootstrapper.py
diff --git a/src/leap/services/eip/tests/test_eipconfig.py b/src/leap/bitmask/services/eip/tests/test_eipconfig.py
index 87ce04c2..87ce04c2 100644
--- a/src/leap/services/eip/tests/test_eipconfig.py
+++ b/src/leap/bitmask/services/eip/tests/test_eipconfig.py
diff --git a/src/leap/services/eip/tests/test_providerbootstrapper.py b/src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py
index b24334a2..b24334a2 100644
--- a/src/leap/services/eip/tests/test_providerbootstrapper.py
+++ b/src/leap/bitmask/services/eip/tests/test_providerbootstrapper.py
diff --git a/src/leap/services/eip/tests/test_vpngatewayselector.py b/src/leap/bitmask/services/eip/tests/test_vpngatewayselector.py
index c90681d7..c90681d7 100644
--- a/src/leap/services/eip/tests/test_vpngatewayselector.py
+++ b/src/leap/bitmask/services/eip/tests/test_vpngatewayselector.py
diff --git a/src/leap/services/eip/tests/wrongcert.pem b/src/leap/bitmask/services/eip/tests/wrongcert.pem
index e6cff38a..e6cff38a 100644
--- a/src/leap/services/eip/tests/wrongcert.pem
+++ b/src/leap/bitmask/services/eip/tests/wrongcert.pem
diff --git a/src/leap/services/eip/udstelnet.py b/src/leap/bitmask/services/eip/udstelnet.py
index e6c82350..e6c82350 100644
--- a/src/leap/services/eip/udstelnet.py
+++ b/src/leap/bitmask/services/eip/udstelnet.py
diff --git a/src/leap/services/eip/vpnlaunchers.py b/src/leap/bitmask/services/eip/vpnlaunchers.py
index 17950a25..17950a25 100644
--- a/src/leap/services/eip/vpnlaunchers.py
+++ b/src/leap/bitmask/services/eip/vpnlaunchers.py
diff --git a/src/leap/services/eip/vpnprocess.py b/src/leap/bitmask/services/eip/vpnprocess.py
index 5b07a3cf..5b07a3cf 100644
--- a/src/leap/services/eip/vpnprocess.py
+++ b/src/leap/bitmask/services/eip/vpnprocess.py
diff --git a/src/leap/services/mail/__init__.py b/src/leap/bitmask/services/mail/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/services/mail/__init__.py
+++ b/src/leap/bitmask/services/mail/__init__.py
diff --git a/src/leap/services/mail/imap.py b/src/leap/bitmask/services/mail/imap.py
index 4dceb2ad..4dceb2ad 100644
--- a/src/leap/services/mail/imap.py
+++ b/src/leap/bitmask/services/mail/imap.py
diff --git a/src/leap/services/mail/smtpbootstrapper.py b/src/leap/bitmask/services/mail/smtpbootstrapper.py
index 48040035..48040035 100644
--- a/src/leap/services/mail/smtpbootstrapper.py
+++ b/src/leap/bitmask/services/mail/smtpbootstrapper.py
diff --git a/src/leap/services/mail/smtpconfig.py b/src/leap/bitmask/services/mail/smtpconfig.py
index ea0f9c37..ea0f9c37 100644
--- a/src/leap/services/mail/smtpconfig.py
+++ b/src/leap/bitmask/services/mail/smtpconfig.py
diff --git a/src/leap/services/mail/smtpspec.py b/src/leap/bitmask/services/mail/smtpspec.py
index ff9d1bf8..ff9d1bf8 100644
--- a/src/leap/services/mail/smtpspec.py
+++ b/src/leap/bitmask/services/mail/smtpspec.py
diff --git a/src/leap/services/soledad/__init__.py b/src/leap/bitmask/services/soledad/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/services/soledad/__init__.py
+++ b/src/leap/bitmask/services/soledad/__init__.py
diff --git a/src/leap/services/soledad/soledadbootstrapper.py b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
index c67bc004..c67bc004 100644
--- a/src/leap/services/soledad/soledadbootstrapper.py
+++ b/src/leap/bitmask/services/soledad/soledadbootstrapper.py
diff --git a/src/leap/services/soledad/soledadconfig.py b/src/leap/bitmask/services/soledad/soledadconfig.py
index a2367692..a2367692 100644
--- a/src/leap/services/soledad/soledadconfig.py
+++ b/src/leap/bitmask/services/soledad/soledadconfig.py
diff --git a/src/leap/services/soledad/soledadspec.py b/src/leap/bitmask/services/soledad/soledadspec.py
index 111175dd..111175dd 100644
--- a/src/leap/services/soledad/soledadspec.py
+++ b/src/leap/bitmask/services/soledad/soledadspec.py
diff --git a/src/leap/services/tests/__init__.py b/src/leap/bitmask/services/tests/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/services/tests/__init__.py
+++ b/src/leap/bitmask/services/tests/__init__.py
diff --git a/src/leap/services/tests/test_abstractbootstrapper.py b/src/leap/bitmask/services/tests/test_abstractbootstrapper.py
index a9ee220f..a9ee220f 100644
--- a/src/leap/services/tests/test_abstractbootstrapper.py
+++ b/src/leap/bitmask/services/tests/test_abstractbootstrapper.py
diff --git a/src/leap/services/tx.py b/src/leap/bitmask/services/tx.py
index 7da1cb01..7da1cb01 100644
--- a/src/leap/services/tx.py
+++ b/src/leap/bitmask/services/tx.py
diff --git a/src/leap/util/__init__.py b/src/leap/bitmask/util/__init__.py
index f39b52e9..f39b52e9 100644
--- a/src/leap/util/__init__.py
+++ b/src/leap/bitmask/util/__init__.py
diff --git a/src/leap/util/constants.py b/src/leap/bitmask/util/constants.py
index 63f6b1f7..63f6b1f7 100644
--- a/src/leap/util/constants.py
+++ b/src/leap/bitmask/util/constants.py
diff --git a/src/leap/util/keyring_helpers.py b/src/leap/bitmask/util/keyring_helpers.py
index 8f354f28..8f354f28 100644
--- a/src/leap/util/keyring_helpers.py
+++ b/src/leap/bitmask/util/keyring_helpers.py
diff --git a/src/leap/util/leap_argparse.py b/src/leap/bitmask/util/leap_argparse.py
index f60c4e10..f60c4e10 100644
--- a/src/leap/util/leap_argparse.py
+++ b/src/leap/bitmask/util/leap_argparse.py
diff --git a/src/leap/util/leap_log_handler.py b/src/leap/bitmask/util/leap_log_handler.py
index 9adb21a5..9adb21a5 100644
--- a/src/leap/util/leap_log_handler.py
+++ b/src/leap/bitmask/util/leap_log_handler.py
diff --git a/src/leap/util/privilege_policies.py b/src/leap/bitmask/util/privilege_policies.py
index 72442553..72442553 100644
--- a/src/leap/util/privilege_policies.py
+++ b/src/leap/bitmask/util/privilege_policies.py
diff --git a/src/leap/util/pyside_tests_helper.py b/src/leap/bitmask/util/pyside_tests_helper.py
index 5c0eb8d6..5c0eb8d6 100644
--- a/src/leap/util/pyside_tests_helper.py
+++ b/src/leap/bitmask/util/pyside_tests_helper.py
diff --git a/src/leap/bitmask/util/reqs.txt b/src/leap/bitmask/util/reqs.txt
new file mode 100644
index 00000000..0bcf85dc
--- /dev/null
+++ b/src/leap/bitmask/util/reqs.txt
@@ -0,0 +1,14 @@
+requests
+srp>=1.0.2
+pyopenssl
+keyring
+python-dateutil
+psutil
+ipaddr
+twisted
+qt4reactor
+python-gnupg
+leap.common>=0.2.5
+leap.soledad>=0.1.0
+mock
+oauth
\ No newline at end of file
diff --git a/src/leap/util/request_helpers.py b/src/leap/bitmask/util/request_helpers.py
index 74aaa06b..74aaa06b 100644
--- a/src/leap/util/request_helpers.py
+++ b/src/leap/bitmask/util/request_helpers.py
diff --git a/src/leap/util/requirement_checker.py b/src/leap/bitmask/util/requirement_checker.py
index 1d9b9923..1d9b9923 100644
--- a/src/leap/util/requirement_checker.py
+++ b/src/leap/bitmask/util/requirement_checker.py
diff --git a/src/leap/util/streamtologger.py b/src/leap/bitmask/util/streamtologger.py
index 25a06718..25a06718 100644
--- a/src/leap/util/streamtologger.py
+++ b/src/leap/bitmask/util/streamtologger.py
diff --git a/src/leap/util/tests/__init__.py b/src/leap/bitmask/util/tests/__init__.py
index e69de29b..e69de29b 100644
--- a/src/leap/util/tests/__init__.py
+++ b/src/leap/bitmask/util/tests/__init__.py
diff --git a/src/leap/util/tests/test_is_release_version.py b/src/leap/bitmask/util/tests/test_is_release_version.py
index 4199f603..4199f603 100644
--- a/src/leap/util/tests/test_is_release_version.py
+++ b/src/leap/bitmask/util/tests/test_is_release_version.py
diff --git a/src/leap/util/tests/test_leap_log_handler.py b/src/leap/bitmask/util/tests/test_leap_log_handler.py
index ea509ea8..ea509ea8 100644
--- a/src/leap/util/tests/test_leap_log_handler.py
+++ b/src/leap/bitmask/util/tests/test_leap_log_handler.py
diff --git a/src/leap/util/tests/test_streamtologger.py b/src/leap/bitmask/util/tests/test_streamtologger.py
index 4c98e562..4c98e562 100644
--- a/src/leap/util/tests/test_streamtologger.py
+++ b/src/leap/bitmask/util/tests/test_streamtologger.py