equal
deleted
inserted
replaced
151 def find_user_password(self, *args, **kwargs): |
151 def find_user_password(self, *args, **kwargs): |
152 return self._get_mgr().find_user_password(*args, **kwargs) |
152 return self._get_mgr().find_user_password(*args, **kwargs) |
153 |
153 |
154 def _catchterm(*args): |
154 def _catchterm(*args): |
155 raise error.SignalInterrupt |
155 raise error.SignalInterrupt |
|
156 |
|
157 # unique object used to detect no default value has been provided when |
|
158 # retrieving configuration value. |
|
159 _unset = object() |
156 |
160 |
157 class ui(object): |
161 class ui(object): |
158 def __init__(self, src=None): |
162 def __init__(self, src=None): |
159 """Create a fresh new ui object if no src given |
163 """Create a fresh new ui object if no src given |
160 |
164 |
430 return untrusted and self._ucfg or self._tcfg |
434 return untrusted and self._ucfg or self._tcfg |
431 |
435 |
432 def configsource(self, section, name, untrusted=False): |
436 def configsource(self, section, name, untrusted=False): |
433 return self._data(untrusted).source(section, name) |
437 return self._data(untrusted).source(section, name) |
434 |
438 |
435 def config(self, section, name, default=None, untrusted=False): |
439 def config(self, section, name, default=_unset, untrusted=False): |
|
440 if default is _unset: |
|
441 default = None |
436 if isinstance(name, list): |
442 if isinstance(name, list): |
437 alternates = name |
443 alternates = name |
438 else: |
444 else: |
439 alternates = [name] |
445 alternates = [name] |
440 |
446 |