settings are in a separate object

test/test_option_owner.py

@@ -3,6 +3,7 @@ import autopath
 from py.test import raises
 from tiramisu.config import *
 from tiramisu.option import *
+from tiramisu.setting import settings
 
 def make_description():
     gcoption = ChoiceOption('name', 'GC name', ['ref', 'framework'], 'ref')
@@ -48,25 +49,6 @@ def make_description2():
                                            intoption, boolop])
     return descr
 
-#def test_override_are_default_owner():
-#    "config.override() implies that the owner is 'default' again"
-#    descr = make_description2()
-#    config = Config(descr)
-#    config.bool = False
-#    # default
-#    assert config.gc._cfgimpl_value_owners['dummy'] == 'default'
-#    # user
-#    config.gc.dummy = True
-#    assert config.gc._cfgimpl_value_owners['dummy'] == 'user'
-#    assert config._cfgimpl_values['gc']._cfgimpl_value_owners['dummy'] == 'user'
-#    #Options have an available default setting and can give it back
-#    assert config._cfgimpl_descr._children[0]._children[1].getdefault() == False
-#    config.override({'gc.dummy':True})
-#    assert config.gc._cfgimpl_value_owners['dummy'] == 'default'
-#    # user again
-#    config.gc.dummy = False
-#    assert config.gc._cfgimpl_value_owners['dummy'] == 'user'
-
 def test_has_callback():
     descr = make_description()
     # here the owner is 'default'
@@ -74,7 +56,7 @@ def test_has_callback():
     config.bool = False
     # because dummy has a callback
     dummy = config.unwrap_from_path('gc.dummy')
-    config.cfgimpl_freeze()
+    settings.freeze()
     dummy.freeze()
     raises(TypeError, "config.gc.dummy = True")
 
@@ -83,12 +65,7 @@ def test_freeze_and_has_callback_with_setoption():
     descr = make_description()
     config = Config(descr)
     config.bool = False
-    config.cfgimpl_freeze()
+    settings.freeze()
     dummy = config.unwrap_from_path('gc.dummy')
     dummy.freeze()
     raises(TypeError, "config.gc.setoption('dummy', True, 'gen_config')")
-
-#def test_cannot_override():
-#    descr = make_description()
-#    config = Config(descr, bool=False)
-#    raises(TypeError, "config.override({'gc.dummy': True})")

test/test_option_type.py

@@ -1,10 +1,11 @@
 # coding: utf-8
-"frozen and hidden values" 
+"frozen and hidden values"
 import autopath
 from py.test import raises
 
 from tiramisu.config import *
 from tiramisu.option import *
+from tiramisu.setting import settings
 
 def make_description():
     gcoption = ChoiceOption('name', 'GC name', ['ref', 'framework'], 'ref')
@@ -23,12 +24,12 @@ def make_description():
     wantframework_option = BoolOption('wantframework', 'Test requires',
                                       default=False,
                                       requires=[('gc.name', 'framework')])
-    
+
     # ____________________________________________________________
     booloptiontwo = BoolOption('booltwo', 'Test boolean option two', default=False)
     subgroup = OptionDescription('subgroup', '', [booloptiontwo])
     # ____________________________________________________________
-    
+
     gcgroup = OptionDescription('gc', '', [subgroup, gcoption, gcdummy, floatoption])
     descr = OptionDescription('trs', '', [gcgroup, booloption, objspaceoption,
                                            wantref_option, stroption,
@@ -52,7 +53,7 @@ def make_description_freeze():
     wantframework_option = BoolOption('wantframework', 'Test requires',
                                       default=False,
                                       requires=['boolop'])
-    
+
     gcgroup = OptionDescription('gc', '', [gcoption, gcdummy, floatoption])
     descr = OptionDescription('tiramisu', '', [gcgroup, booloption, objspaceoption,
                                            wantref_option, stroption,
@@ -74,7 +75,7 @@ def test_frozen_value():
     s = StrOption("string", "", default="string")
     descr = OptionDescription("options", "", [s])
     config = Config(descr)
-    config.cfgimpl_freeze()
+    settings.freeze()
     s.freeze()
     raises(TypeError, 'config.string = "egg"')
 
@@ -82,7 +83,7 @@ def test_freeze():
     "freeze a whole configuration object"
     descr = make_description()
     conf = Config(descr)
-    conf.cfgimpl_freeze()
+    settings.freeze()
     name = conf.unwrap_from_path("gc.name")
     name.freeze()
     raises(TypeError, "conf.gc.name = 'framework'")
@@ -115,7 +116,7 @@ def test_group_is_hidden():
     assert config.gc.float == 2.3
     #dummy est en hide
     raises(PropertiesOptionError, "config.gc.dummy == False")
-    
+
 def test_global_show():
     descr = make_description()
     config = Config(descr)
@@ -133,4 +134,3 @@ def test_with_many_subgroups():
     assert name == "booltwo"
     option = getattr(homeconfig._cfgimpl_descr, name)
     assert option._is_hidden()
-

test/test_option_with_special_name.py

@@ -4,6 +4,7 @@ from py.test import raises
 
 from tiramisu.config import *
 from tiramisu.option import *
+from tiramisu.setting import settings
 
 def make_description():
     gcoption = ChoiceOption('name', 'GC name', ['ref', 'framework'], 'ref')
@@ -39,6 +40,6 @@ def test_root_config_answers_ok():
     boolop = BoolOption('boolop', 'Test boolean option op', default=True)
     descr = OptionDescription('tiramisu', '', [gcdummy, boolop])
     cfg = Config(descr)
-    cfg.cfgimpl_enable_property('hiddend') #cfgimpl_hide()
+    settings.enable_property('hiddend') #cfgimpl_hide()
     assert cfg.dummy == False
     assert cfg.boolop  == True