From 6b87a0b9f7f602f790ffd5d15c76e7a5f97408b7 Mon Sep 17 00:00:00 2001 From: Jed Reynolds Date: Fri, 6 Aug 2021 11:52:01 -0700 Subject: [PATCH] lf_json_autogen.py: changes to EID -> URL generation, this will not compile yet --- py-json/LANforge/lf_json_autogen.py | 622 ++++++++++------------------ 1 file changed, 230 insertions(+), 392 deletions(-) diff --git a/py-json/LANforge/lf_json_autogen.py b/py-json/LANforge/lf_json_autogen.py index a202b2b5..513a2edb 100644 --- a/py-json/LANforge/lf_json_autogen.py +++ b/py-json/LANforge/lf_json_autogen.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 """----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- - Generated by LANforge JsonApiPythonGenerator, Thu Aug 05 18:19:37 PDT 2021 + Generated by LANforge JsonApiPythonGenerator, Fri Aug 06 11:45:38 PDT 2021 - - WORK IN PROGRESS - - The API this library provides is actively being changed. This file expects to live in py-json/LANforge directory. @@ -100,29 +100,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -192,29 +186,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -258,29 +246,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -343,29 +325,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -456,29 +432,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -588,29 +558,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -669,29 +633,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -766,29 +724,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -854,29 +806,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -920,29 +866,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -1038,29 +978,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -1197,29 +1131,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -1263,29 +1191,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -1360,29 +1282,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -1458,29 +1374,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -1532,29 +1442,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -1617,29 +1521,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -1689,29 +1587,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -1763,29 +1655,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -1836,29 +1722,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -1931,29 +1811,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -2039,29 +1913,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -2150,29 +2018,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -2238,29 +2100,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -2327,29 +2183,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -2433,29 +2283,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -2500,29 +2344,23 @@ class LFJsonGet(LFCliBase): if (eid_list is None) or (len(eid_list) < 1): raise ValueError("no entity id in request") if (requested_col_names is None) or (len(requested_col_names) < 1): - raise ValueError("requested_col_names must be a list of column names, a column name, or 'list' or 'all'") + raise ValueError("requested_col_names must be a column name, or a list of column names") trimmed_fields = [] if (isinstance(requested_col_names, str)): if not requested_col_names.strip(): raise ValueError("column name cannot be blank") trimmed_fields.append(requested_col_names.strip()) if (isinstance(requested_col_names, list)): - all_found=0 for field in requested_col_names: if not field.strip(): raise ValueError("column names cannot be blank") field = field.strip() if field.find(" ") > -1 : raise ValueError("field should be URL encoded: [%s]" % (field)) - if (field == 'all') or (field == 'list'): - found_all = 1 trimmed_fields.append(field) - if isinstance(eid_list, list): - url += "/1/%s" % (",".join(eid_list)) - else: - url += "/1/%s" % eid_list + url += make_eid_url(eid_list) - if (found_all != 0) and (len(trimmed_fields) > 0): + if len(trimmed_fields) > 0: url += "?fields=%s" % (",".join(trimmed_fields)) response = self.json_get(url, debug_=debug_) @@ -2639,9 +2477,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -2657,9 +2495,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -2939,9 +2777,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -2957,9 +2795,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -3251,9 +3089,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -3269,9 +3107,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -3422,9 +3260,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -3440,9 +3278,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -3654,9 +3492,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -3672,9 +3510,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -3859,9 +3697,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -3877,9 +3715,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -3949,9 +3787,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -3967,9 +3805,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -4016,9 +3854,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -4034,9 +3872,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -4072,9 +3910,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -4090,9 +3928,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -4197,9 +4035,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -4215,9 +4053,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -4410,9 +4248,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -4428,9 +4266,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -4685,9 +4523,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -4703,9 +4541,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -5058,9 +4896,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -5076,9 +4914,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -5228,9 +5066,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -5246,9 +5084,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -5375,9 +5213,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -5393,9 +5231,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -5457,9 +5295,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -5475,9 +5313,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -5664,9 +5502,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -5682,9 +5520,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -5769,9 +5607,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -5787,9 +5625,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -5887,9 +5725,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -5905,9 +5743,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -6271,9 +6109,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -6289,9 +6127,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -7273,9 +7111,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -7291,9 +7129,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -7556,9 +7394,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -7574,9 +7412,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -9042,9 +8880,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -9060,9 +8898,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -9735,9 +9573,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -9753,9 +9591,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -9822,9 +9660,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -9840,9 +9678,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -9894,9 +9732,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -9912,9 +9750,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -10376,9 +10214,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -10394,9 +10232,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -10466,9 +10304,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -10484,9 +10322,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -10561,9 +10399,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -10579,9 +10417,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -10649,9 +10487,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -10667,9 +10505,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -10926,9 +10764,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -10944,9 +10782,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -11050,9 +10888,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -11068,9 +10906,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -11380,9 +11218,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -11398,9 +11236,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -11571,9 +11409,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -11589,9 +11427,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -11864,9 +11702,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -11882,9 +11720,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -12085,9 +11923,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -12103,9 +11941,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self): @@ -13293,9 +13131,9 @@ class LFJsonPost(LFCliBase): for flag in (flag_names): if flag is None: continue - self.selected_named_flag_map.put(flag, 0) + self.selected_named_flag_map[ flag ] = 0 elif flag_names is not None: - self.selected_named_flag_map.put(flag_names, 0) + self.selected_named_flag_map[ flag_names ] = 0 self.update_flag_value() def clear_flags(self, flag_names=None): @@ -13311,9 +13149,9 @@ class LFJsonPost(LFCliBase): if flag is None: continue if flag in self.selected_named_flag_map: - self.selected_named_flag_map.remove(flag) + del self.selected_named_flag_map[flag] elif (flag_names is not None) and (flag_names in self.selected_named_flag_map): - self.selected_named_flag_map.remove(flag_names) + del self.selected_named_flag_map[flag_names] self.update_flag_value() def value(self):