diff options
author | Pavel Zuna <pzuna@redhat.com> | 2009-05-25 10:12:40 +0200 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2009-06-10 11:51:10 -0400 |
commit | cda0f85ce531a3250d745d73e099a47ec6787279 (patch) | |
tree | d195d8b31b40321ed25de2de0ae21cf2a07e67fc /ipalib/encoder.py | |
parent | 16f19990aeb68df935ea6be83c99d2478dcd0fa6 (diff) | |
download | freeipa-cda0f85ce531a3250d745d73e099a47ec6787279.tar.gz freeipa-cda0f85ce531a3250d745d73e099a47ec6787279.tar.xz freeipa-cda0f85ce531a3250d745d73e099a47ec6787279.zip |
Fix bug in Encoder where tuples were encoded into lists. Fix Encoder and Command.args_options_2_entry unit tests.
Diffstat (limited to 'ipalib/encoder.py')
-rw-r--r-- | ipalib/encoder.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipalib/encoder.py b/ipalib/encoder.py index a0ab8032..2c5cebd6 100644 --- a/ipalib/encoder.py +++ b/ipalib/encoder.py @@ -39,7 +39,7 @@ class EncoderSettings(object): decode_dict_vals = True decode_dict_vals_postprocess = True decode_dict_vals_table = dict() - decode_dict_vals_table_keygen = staticmethod(lambda x: x) + decode_dict_vals_table_keygen = staticmethod(lambda x, y: x) decode_postprocessor = staticmethod(lambda x: x) @@ -81,7 +81,7 @@ class Encoder(object): elif isinstance(var, list): return [self.encode(m) for m in var] elif isinstance(var, tuple): - return list(self.encode(m) for m in var) + return tuple(self.encode(m) for m in var) elif isinstance(var, dict): if self.encoder_settings.encode_dict_keys: dct = dict() @@ -131,7 +131,7 @@ class Encoder(object): elif isinstance(var, list): return [self.decode(m) for m in var] elif isinstance(var, tuple): - return list(self.decode(m) for m in var) + return tuple(self.decode(m) for m in var) elif isinstance(var, dict): if self.encoder_settings.decode_dict_keys: dct = dict() |