relative imports to absolute imports (fixes #2667)
This commit is contained in:
parent
9b876f6463
commit
a871cab083
2
setup.py
2
setup.py
|
@ -9,6 +9,6 @@ setup(
|
||||||
version='1.0',
|
version='1.0',
|
||||||
description='configuration management tool',
|
description='configuration management tool',
|
||||||
url='http://labs.libre-entreprise.org/projects/tiramisu',
|
url='http://labs.libre-entreprise.org/projects/tiramisu',
|
||||||
package_dir = {'tiramisu':'src'},
|
package_dir = {'tiramisu':'tiramisu'},
|
||||||
packages=['tiramisu']
|
packages=['tiramisu']
|
||||||
)
|
)
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
# the whole pypy projet is under MIT licence
|
# the whole pypy projet is under MIT licence
|
||||||
# ____________________________________________________________
|
# ____________________________________________________________
|
||||||
"enables us to carry out a calculation and return an option's value"
|
"enables us to carry out a calculation and return an option's value"
|
||||||
from error import DisabledOptionError, SpecialOwnersError
|
from tiramisu.error import DisabledOptionError, SpecialOwnersError
|
||||||
# ____________________________________________________________
|
# ____________________________________________________________
|
||||||
# automatic Option object
|
# automatic Option object
|
||||||
special_owners = ['auto', 'fill']
|
special_owners = ['auto', 'fill']
|
|
@ -20,14 +20,14 @@
|
||||||
# the rough pypy's guys: http://codespeak.net/svn/pypy/dist/pypy/config/
|
# the rough pypy's guys: http://codespeak.net/svn/pypy/dist/pypy/config/
|
||||||
# the whole pypy projet is under MIT licence
|
# the whole pypy projet is under MIT licence
|
||||||
# ____________________________________________________________
|
# ____________________________________________________________
|
||||||
from error import (HiddenOptionError, ConfigError, NotFoundError,
|
from copy import copy
|
||||||
|
from tiramisu.error import (HiddenOptionError, ConfigError, NotFoundError,
|
||||||
AmbigousOptionError, ConflictConfigError, NoMatchingOptionFound,
|
AmbigousOptionError, ConflictConfigError, NoMatchingOptionFound,
|
||||||
SpecialOwnersError, MandatoryError, MethodCallError,
|
SpecialOwnersError, MandatoryError, MethodCallError,
|
||||||
DisabledOptionError, ModeOptionError)
|
DisabledOptionError, ModeOptionError)
|
||||||
from option import (OptionDescription, Option, SymLinkOption, group_types,
|
from tiramisu.option import (OptionDescription, Option, SymLinkOption, group_types,
|
||||||
Multi, apply_requires, modes)
|
Multi, apply_requires, modes)
|
||||||
from autolib import special_owners, special_owner_factory
|
from tiramisu.autolib import special_owners, special_owner_factory
|
||||||
from copy import copy
|
|
||||||
# ______________________________________________________________________
|
# ______________________________________________________________________
|
||||||
# generic owner. 'default' is the general config owner after init time
|
# generic owner. 'default' is the general config owner after init time
|
||||||
default_owner = 'user'
|
default_owner = 'user'
|
|
@ -20,9 +20,9 @@
|
||||||
# the rough pypy's guys: http://codespeak.net/svn/pypy/dist/pypy/config/
|
# the rough pypy's guys: http://codespeak.net/svn/pypy/dist/pypy/config/
|
||||||
# the whole pypy projet is under MIT licence
|
# the whole pypy projet is under MIT licence
|
||||||
# ____________________________________________________________
|
# ____________________________________________________________
|
||||||
from autolib import special_owners
|
from tiramisu.autolib import special_owners
|
||||||
from basetype import HiddenBaseType, DisabledBaseType, ModeBaseType, modes
|
from tiramisu.basetype import HiddenBaseType, DisabledBaseType, ModeBaseType, modes
|
||||||
from error import (ConfigError, ConflictConfigError, NotFoundError,
|
from tiramisu.error import (ConfigError, ConflictConfigError, NotFoundError,
|
||||||
SpecialOwnersError, RequiresError)
|
SpecialOwnersError, RequiresError)
|
||||||
available_actions = ['hide', 'show', 'enable', 'disable']
|
available_actions = ['hide', 'show', 'enable', 'disable']
|
||||||
reverse_actions = {'hide': 'show', 'show': 'hide',
|
reverse_actions = {'hide': 'show', 'show': 'hide',
|
|
@ -17,8 +17,8 @@
|
||||||
# The original `Config` design model is unproudly borrowed from
|
# The original `Config` design model is unproudly borrowed from
|
||||||
# the rough gus of pypy: pypy: http://codespeak.net/svn/pypy/dist/pypy/config/
|
# the rough gus of pypy: pypy: http://codespeak.net/svn/pypy/dist/pypy/config/
|
||||||
# the whole pypy projet is under MIT licence
|
# the whole pypy projet is under MIT licence
|
||||||
from config import Config
|
from tiramisu.config import Config
|
||||||
from option import (OptionDescription, Option, ChoiceOption, BoolOption,
|
from tiramisu.option import (OptionDescription, Option, ChoiceOption, BoolOption,
|
||||||
FloatOption, StrOption, IntOption, IPOption, NetmaskOption,
|
FloatOption, StrOption, IntOption, IPOption, NetmaskOption,
|
||||||
ArbitraryOption, group_types, apply_requires)
|
ArbitraryOption, group_types, apply_requires)
|
||||||
|
|
Loading…
Reference in New Issue