Rev 5484: Not relevant anymore. in file:///home/vila/src/bzr/experimental/config/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/config/

------------------------------------------------------------
revno: 5484
revision-id: v.ladeuil+lp at free.fr-20110531154933-2elp2fah12lpavc6
parent: v.ladeuil+lp at free.fr-20110531154717-f20fhdtwc8w36d7b
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: next
timestamp: Tue 2011-05-31 17:49:33 +0200
message:
  Not relevant anymore.
-------------- next part --------------
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py	2011-05-25 14:47:25 +0000
+++ b/bzrlib/bzrdir.py	2011-05-31 15:49:33 +0000
@@ -2286,8 +2286,6 @@
     hidden=True,
     help='Same as 2a.')
 
-# FIXME: The following defeats the lazy loading of config -- vila 20110515
-#
 # The current format that is made on 'bzr init'.
 format_name = config.GlobalConfig().get_user_option('default_format')
 if format_name is None:

=== modified file 'bzrlib/tests/test_config.py'
--- a/bzrlib/tests/test_config.py	2011-05-31 15:47:17 +0000
+++ b/bzrlib/tests/test_config.py	2011-05-31 15:49:33 +0000
@@ -66,20 +66,6 @@
           'config_section': '.'}),]
 
 
-def config_scenarios():
-    """The scenarios allowing test  to be exercised against all known configs.
-
-    This should provide the necessary environement to use a *valid* config.
-    """
-    # The scenario name must be unique so we may as well use a dict rather than
-    # a list.
-    scenarios = {
-        'bazaar': {},
-        'locations': {},
-        'branch': {}
-        }
-
-
 load_tests = scenarios.load_tests_apply_scenarios
 
 # Register helpers to build stores