diff options
Diffstat (limited to 'ipalib')
| -rw-r--r-- | ipalib/config.py | 1 | ||||
| -rw-r--r-- | ipalib/rpc.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ipalib/config.py b/ipalib/config.py index 42d7ab578..39c4238cf 100644 --- a/ipalib/config.py +++ b/ipalib/config.py @@ -433,7 +433,6 @@ class Env(object): self.script = path.abspath(sys.argv[0]) self.bin = path.dirname(self.script) self.home = os.environ.get('HOME', None) - self.etc = path.join('/', 'etc', 'ipa') self.dot_ipa = self._join('home', '.ipa') self._merge(**overrides) if 'in_tree' not in self: diff --git a/ipalib/rpc.py b/ipalib/rpc.py index 5a1f9e1ed..938c30e64 100644 --- a/ipalib/rpc.py +++ b/ipalib/rpc.py @@ -137,12 +137,14 @@ def xml_dumps(params, methodname=None, methodresponse=False, encoding='UTF-8'): allow_none=True, ) + def decode_fault(e, encoding='UTF-8'): assert isinstance(e, Fault) if type(e.faultString) is str: return Fault(e.faultCode, e.faultString.decode(encoding)) return e + def xml_loads(data, encoding='UTF-8'): """ Decode the XML-RPC packet in ``data``, transparently unwrapping its params. |