Skip to content

Commit

Permalink
Reverted previous change. No longer necessary as the actual issue was…
Browse files Browse the repository at this point in the history
… in the bindings
  • Loading branch information
ikiril01 committed Nov 6, 2013
1 parent 193f820 commit e30d2ac
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions cybox/common/attribute_groups.py
Original file line number Diff line number Diff line change
@@ -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."""

Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down

0 comments on commit e30d2ac

Please sign in to comment.