From e30d2acf6d67a325ba2502021722535c520fd21e Mon Sep 17 00:00:00 2001 From: Ivan Kirillov Date: Wed, 6 Nov 2013 13:26:45 -0500 Subject: [PATCH] Reverted previous change. No longer necessary as the actual issue was in the bindings --- cybox/common/attribute_groups.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cybox/common/attribute_groups.py b/cybox/common/attribute_groups.py index 46757de6..8c7ef832 100644 --- a/cybox/common/attribute_groups.py +++ b/cybox/common/attribute_groups.py @@ -1,8 +1,6 @@ # Copyright (c) 2013, The MITRE Corporation. All rights reserved. # See LICENSE.txt for complete terms. -__LIST_DELIMITER__ = "##comma##" - class PatternFieldGroup(object): """A mixin class for CybOX entities which are patternable.""" @@ -47,7 +45,7 @@ def to_obj(self, partial_obj): if self.condition is not None: partial_obj.set_condition(self.condition) # Only add 'apply_condition' if 'condition' is set - if self.apply_condition is not None and (isinstance(self.value, list) or __LIST_DELIMITER__ in self.value): + if self.apply_condition is not None and isinstance(self.value, list): partial_obj.set_apply_condition(self.apply_condition) if self.bit_mask is not None: partial_obj.set_bit_mask(self.bit_mask) @@ -67,7 +65,7 @@ def to_dict(self, partial_dict): if self.condition is not None: partial_dict['condition'] = self.condition # Only add 'apply_condition' if 'condition' is set - if self.apply_condition is not None and (isinstance(self.value, list) or __LIST_DELIMITER__ in self.value): + if self.apply_condition is not None and isinstance(self.value, list): partial_dict['apply_condition'] = self.apply_condition if self.bit_mask is not None: partial_dict['bit_mask'] = self.bit_mask