diff options
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | src/leap/common/ca_bundle.py | 8 | ||||
| -rw-r--r-- | src/leap/common/events/__init__.py | 8 |
4 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,7 @@ +0.3.9 Jul 18, 2014: + o Include pemfile in the package data. Closes #5897. + o Look for bundled cacert.pem in the Resources dir for OSX. + 0.3.8 Jun 6, 2014: o Add Soledad sync status signals. Closes #5517. @@ -127,6 +127,7 @@ setup( classifiers=trove_classifiers, namespace_packages=["leap"], package_dir={'': 'src'}, + package_data={'': ['*.pem']}, # For now, we do not exclude tests because of the circular dependency # between leap.common and leap.soledad. #packages=find_packages('src', exclude=['leap.common.tests']), diff --git a/src/leap/common/ca_bundle.py b/src/leap/common/ca_bundle.py index 1e00f25..d8c72a6 100644 --- a/src/leap/common/ca_bundle.py +++ b/src/leap/common/ca_bundle.py @@ -21,8 +21,12 @@ If you are packaging Requests, e.g., for a Linux distribution or a managed environment, you can change the definition of where() to return a separately packaged CA bundle. """ +import platform import os.path +_system = platform.system() + +IS_MAC = _system == "Darwin" def where(): """ @@ -30,6 +34,10 @@ def where(): :rtype: str """ # vendored bundle inside Requests, plus some additions of ours + if IS_MAC: + return os.path.join("/Applications", "Bitmask.app", + "Contents", "Resources", + "cacert.pem") return os.path.join(os.path.dirname(__file__), 'cacert.pem') if __name__ == '__main__': diff --git a/src/leap/common/events/__init__.py b/src/leap/common/events/__init__.py index 6eaf3d4..0cc6573 100644 --- a/src/leap/common/events/__init__.py +++ b/src/leap/common/events/__init__.py @@ -27,14 +27,14 @@ To register a callback to be executed when a specific event is signaled, use leap.common.events.register(): >>> from leap.common.events import register ->>> from leap.common.events.proto import CLIENT_UID ->>> register(CLIENT_UID, lambda req: do_something(req)) +>>> from leap.common.events import events_pb2 as proto +>>> register(proto.CLIENT_UID, lambda req: do_something(req)) To signal an event, use leap.common.events.signal(): >>> from leap.common.events import signal ->>> from leap.common.events.proto import CLIENT_UID ->>> signal(CLIENT_UID) +>>> from leap.common.events import events_pb2 as proto +>>> signal(proto.CLIENT_UID) NOTE ABOUT SYNC/ASYNC REQUESTS: |