Rev 5806: Merge config-hooks into selftest-config-stats in file:///home/vila/src/bzr/experimental/config/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 5806 [merge]
revision-id: v.ladeuil+lp at free.fr-20110615203507-3f8tfdo120rku7jg
parent: v.ladeuil+lp at free.fr-20110615203307-s7z2c3oeqxgwtphc
parent: v.ladeuil+lp at free.fr-20110615203425-zpj6csujrsc85fv9
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: selftest-config-stats
timestamp: Wed 2011-06-15 22:35:07 +0200
message:
  Merge config-hooks into selftest-config-stats
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-06-14 10:07:16 +0000
+++ b/bzrlib/config.py	2011-06-15 20:34:25 +0000
@@ -372,7 +372,7 @@
             else:
                 value = self._expand_options_in_string(value)
         for hook in OldConfigHooks['get']:
-            hook(self, option_name, value)        
+            hook(self, option_name, value)
         return value
 
     def get_user_option_as_bool(self, option_name, expand=None):
@@ -1719,7 +1719,7 @@
         section[option_name] = value
         self._save()
 
-    def get_credentials(self, scheme, host, port=None, user=None, path=None, 
+    def get_credentials(self, scheme, host, port=None, user=None, path=None,
                         realm=None):
         """Returns the matching credentials from authentication.conf file.
 
@@ -2140,7 +2140,7 @@
                 return default
         value = section_obj.get(name, default)
         for hook in OldConfigHooks['get']:
-            hook(self, name, value)        
+            hook(self, name, value)
         return value
 
     def set_option(self, value, name, section=None):