diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/pkg/requirements.pip | 9 | ||||
| -rw-r--r-- | common/src/leap/soledad/common/__init__.py | 46 |
2 files changed, 15 insertions, 40 deletions
diff --git a/common/pkg/requirements.pip b/common/pkg/requirements.pip index 5787114e..ea2f3fa2 100644 --- a/common/pkg/requirements.pip +++ b/common/pkg/requirements.pip @@ -1,7 +1,10 @@ simplejson u1db -#this is not strictly needed by us, but we need it -#until u1db adds it to its release as a dep. -oauth +# leap deps -- bump me! +leap.common +# XXX -- fix me! +# oauth is not strictly needed by us, but we need it until u1db adds it to its +# release as a dep. +oauth diff --git a/common/src/leap/soledad/common/__init__.py b/common/src/leap/soledad/common/__init__.py index c5c4b97f..1e52e3a7 100644 --- a/common/src/leap/soledad/common/__init__.py +++ b/common/src/leap/soledad/common/__init__.py @@ -34,45 +34,17 @@ USER_DB_PREFIX = 'user-' # Global functions # -# we want to use leap.common.check.leap_assert in case it is available, -# because it also logs in a way other parts of leap can access log messages. - -try: - from leap.common.check import leap_assert as soledad_assert - -except ImportError: - - def soledad_assert(condition, message): - """ - Asserts the condition and displays the message if that's not - met. - - @param condition: condition to check - @type condition: bool - @param message: message to display if the condition isn't met - @type message: str - """ - assert condition, message - -try: - from leap.common.check import leap_assert_type as soledad_assert_type - -except ImportError: - - def soledad_assert_type(var, expectedType): - """ - Helper assert check for a variable's expected type - - @param var: variable to check - @type var: any - @param expectedType: type to check agains - @type expectedType: type - """ - soledad_assert(isinstance(var, expectedType), - "Expected type %r instead of %r" % - (expectedType, type(var))) +from leap.common.check import leap_assert as soledad_assert +from leap.common.check import leap_assert_type as soledad_assert_type from ._version import get_versions __version__ = get_versions()['version'] del get_versions + + +__all__ = [ + "soledad_assert", + "soledad_assert_type", + "__version__", +] |