diff options
| author | kali <kali@leap.se> | 2013-03-14 07:08:31 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-03-15 01:02:11 +0900 |
| commit | d0dfad6ac2af360de6421ce74a6831b5b81ad019 (patch) | |
| tree | a0a79d4fb328e09ab85f53d826d65f5d7f874f0c /src/leap/config | |
| parent | b76461efe13d24950cb389735432024c26e1e768 (diff) | |
namespace leap + leap.common split
leap is a namespace package from here on.
common folder will be deleted and moved to leap_pycommon repository.
Diffstat (limited to 'src/leap/config')
| -rw-r--r-- | src/leap/config/baseconfig.py | 8 | ||||
| -rw-r--r-- | src/leap/config/pluggableconfig.py | 2 | ||||
| -rw-r--r-- | src/leap/config/prefixers.py | 4 | ||||
| -rw-r--r-- | src/leap/config/providerconfig.py | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/leap/config/baseconfig.py b/src/leap/config/baseconfig.py index 90529042..c497d156 100644 --- a/src/leap/config/baseconfig.py +++ b/src/leap/config/baseconfig.py @@ -19,17 +19,17 @@ Implements the abstract base class for configuration """ +import copy import logging import functools import os -import copy from abc import ABCMeta, abstractmethod -from leap.config.prefixers import get_platform_prefixer +from leap.common.check import leap_assert +from leap.common.files import mkdir_p from leap.config.pluggableconfig import PluggableConfig -from leap.util.check import leap_assert -from leap.util.files import mkdir_p +from leap.config.prefixers import get_platform_prefixer logger = logging.getLogger(__name__) diff --git a/src/leap/config/pluggableconfig.py b/src/leap/config/pluggableconfig.py index 5ed83b3f..4a742da4 100644 --- a/src/leap/config/pluggableconfig.py +++ b/src/leap/config/pluggableconfig.py @@ -28,7 +28,7 @@ import urlparse import jsonschema #from leap.base.util.translations import LEAPTranslatable -from leap.util.check import leap_assert +from leap.common.check import leap_assert logger = logging.getLogger(__name__) diff --git a/src/leap/config/prefixers.py b/src/leap/config/prefixers.py index 64c36908..dc00b5b6 100644 --- a/src/leap/config/prefixers.py +++ b/src/leap/config/prefixers.py @@ -18,13 +18,13 @@ """ Platform dependant configuration path prefixers """ +from abc import ABCMeta, abstractmethod import os import platform -from abc import ABCMeta, abstractmethod from xdg import BaseDirectory -from leap.util.check import leap_assert +from leap.common.check import leap_assert class Prefixer: diff --git a/src/leap/config/providerconfig.py b/src/leap/config/providerconfig.py index 55b33b98..71b2856f 100644 --- a/src/leap/config/providerconfig.py +++ b/src/leap/config/providerconfig.py @@ -21,9 +21,9 @@ Provider configuration import logging import os +from leap.common.check import leap_assert from leap.config.baseconfig import BaseConfig, LocalizedKey from leap.config.provider_spec import leap_provider_spec -from leap.util.check import leap_assert logger = logging.getLogger(__name__) |