summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-07-10 12:02:19 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-07-10 12:02:19 -0300
commit07686dfa07b03d5faa609a1554894aadf275a738 (patch)
treec97c7f997c0e8ebbdcb015150b5f583f6f0313a6 /src/leap/bitmask
parentc0cc3f6f13ef8bc3dadec86bede2b286cea4e966 (diff)
parent2d7fcd6cbb65945c64fe9fa949a6d176f5dd0d6c (diff)
Merge remote-tracking branch 'chiiph/feature/package_osx_py2app' into develop
Diffstat (limited to 'src/leap/bitmask')
-rw-r--r--src/leap/bitmask/__init__.py6
-rw-r--r--src/leap/bitmask/gui/__init__.py6
2 files changed, 10 insertions, 2 deletions
diff --git a/src/leap/bitmask/__init__.py b/src/leap/bitmask/__init__.py
index 0f733f26..03da1e2f 100644
--- a/src/leap/bitmask/__init__.py
+++ b/src/leap/bitmask/__init__.py
@@ -25,6 +25,12 @@ from pkg_resources import parse_version
from leap.bitmask.util import first
+# HACK: This is a hack so that py2app copies _scrypt.so to the right
+# place, it can't be technically imported, but that doesn't matter
+# because the import is never executed
+if False:
+ import _scrypt
+
def _is_release_version(version):
"""
diff --git a/src/leap/bitmask/gui/__init__.py b/src/leap/bitmask/gui/__init__.py
index 4b289442..94bf1fd5 100644
--- a/src/leap/bitmask/gui/__init__.py
+++ b/src/leap/bitmask/gui/__init__.py
@@ -17,5 +17,7 @@
"""
init file for leap.gui
"""
-app = __import__("app", globals(), locals(), [], 2)
-__all__ = [app]
+# This was added for coverage and testing, but when doing the osx
+# bundle with py2app it fails because of this, so commenting for now
+# app = __import__("app", globals(), locals(), [], 2)
+# __all__ = [app]