From e14fc84dfccbb06f775bbd5d3de864c7b879453f Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Mon, 29 Dec 2008 21:23:34 -0700 Subject: Renamed Env._merge_config() to Env._merge_from_file() --- ipalib/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ipalib/config.py') diff --git a/ipalib/config.py b/ipalib/config.py index dc5d35f8..6b016541 100644 --- a/ipalib/config.py +++ b/ipalib/config.py @@ -334,8 +334,8 @@ class Env(object): self.__doing('_finalize_core') self.__do_if_not_done('_bootstrap') if self.__d.get('mode', None) != 'dummy': - self._merge_config(self.conf) - self._merge_config(self.conf_default) + self._merge_from_file(self.conf) + self._merge_from_file(self.conf_default) if 'in_server' not in self: self.in_server = (self.context == 'server') if 'log' not in self: @@ -371,7 +371,7 @@ class Env(object): self[key] = value self.__lock__() - def _merge_config(self, conf_file): + def _merge_from_file(self, conf_file): """ Merge values from ``conf_file`` into this `Env`. """ -- cgit