diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-02-14 11:34:16 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-02-22 17:20:35 +0100 |
| commit | b4915bd2fde861279ba18acf940d7a5880a58ba6 (patch) | |
| tree | 5de71b4f687069fef5cc686f69f6b7f1336bac39 /ipalib/parameters.py | |
| parent | da42daac2929972889aa42ec3a6d82a1aca4f1d7 (diff) | |
| download | freeipa-b4915bd2fde861279ba18acf940d7a5880a58ba6.tar.gz freeipa-b4915bd2fde861279ba18acf940d7a5880a58ba6.tar.xz freeipa-b4915bd2fde861279ba18acf940d7a5880a58ba6.zip | |
Remove csv_separator and csv_skipspace Param arguments
These were never set to anything but the defaults.
Part of work for https://fedorahosted.org/freeipa/ticket/3352
Diffstat (limited to 'ipalib/parameters.py')
| -rw-r--r-- | ipalib/parameters.py | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/ipalib/parameters.py b/ipalib/parameters.py index 2e26923d..9fed0fd5 100644 --- a/ipalib/parameters.py +++ b/ipalib/parameters.py @@ -356,10 +356,6 @@ class Param(ReadOnly): - sortorder: used to sort a list of parameters for Command. See `Command.finalize()` for further information - csv: this multivalue attribute is given in CSV format - - csv_separator: character that separates values in CSV (comma by - default) - - csv_skipspace: if true, leading whitespace will be ignored in - individual CSV values """ # This is a dummy type so that most of the functionality of Param can be @@ -393,8 +389,6 @@ class Param(ReadOnly): ('alwaysask', bool, False), ('sortorder', int, 2), # see finalize() ('csv', bool, False), - ('csv_separator', str, ','), - ('csv_skipspace', bool, True), ('option_group', unicode, None), # The 'default' kwarg gets appended in Param.__init__(): @@ -690,9 +684,8 @@ class Param(ReadOnly): def __unicode_csv_reader(self, unicode_csv_data, dialect=csv.excel, **kwargs): # csv.py doesn't do Unicode; encode temporarily as UTF-8: csv_reader = csv.reader(self.__utf_8_encoder(unicode_csv_data), - dialect=dialect, - delimiter=self.csv_separator, quotechar='"', - skipinitialspace=self.csv_skipspace, + dialect=dialect, delimiter=',', quotechar='"', + skipinitialspace=True, **kwargs) try: for row in csv_reader: @@ -967,8 +960,7 @@ class Param(ReadOnly): json_exclude_attrs = ( 'alwaysask', 'autofill', 'cli_name', 'cli_short_name', 'csv', - 'csv_separator', 'csv_skipspace', 'sortorder', 'falsehoods', 'truths', - 'version', + 'sortorder', 'falsehoods', 'truths', 'version', ) def __json__(self): |