summaryrefslogtreecommitdiff
path: root/src/leap/base/config.py
AgeCommit message (Collapse)Author
2012-08-24Merge branch 'get-definition.json' into providers-statickali
adjusted some loose ends to make tests pass again. this merge is still half-baked regarding functionality: I've left in place old Configuration class used by some tests antialias did on his branch. I plan to merge that functionality with the more recent JSONConfig and Spec classes. Conflicts: src/leap/base/configuration.py src/leap/eip/config.py src/leap/eip/tests/test_config.py
2012-08-24fix circular importkali
2012-08-23moved help functions from eip/config.py to base/configuration.py.antialias
(cherry picked from get-definition.json branch) solve merge conflict since antialias was working in a version in which baseconfig was still at `configuration` file. Conflicts: src/leap/base/configuration.py
2012-08-23base config and json-configkali
an initial attempt at stablishing base classes for config. we go with a jsonconfig by now, and will switch to a different storage backend in near future. things will surely be broken at this state; i'm splitting work on different commits.