From 8327de6e1f60b32050910abcba88d24e6bd87e5f Mon Sep 17 00:00:00 2001 From: Greg Back Date: Thu, 28 May 2015 08:33:46 -0500 Subject: [PATCH] Undo capitalization change of Email_Message. Partially revert ce549b8de55a098cc0b3eadaf3db73248c710c0a --- cybox/bindings/email_message_object.py | 8 ++++---- cybox/bindings/win_task_object.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cybox/bindings/email_message_object.py b/cybox/bindings/email_message_object.py index 69eaf219..80eaf1b1 100644 --- a/cybox/bindings/email_message_object.py +++ b/cybox/bindings/email_message_object.py @@ -1064,7 +1064,7 @@ def parse(inFileName): rootNode = doc.getroot() rootTag, rootClass = get_root_tag(rootNode) if rootClass is None: - rootTag = 'email_message' + rootTag = 'Email_Message' rootClass = EmailMessageObjectType rootObj = rootClass.factory() rootObj.build(rootNode) @@ -1081,7 +1081,7 @@ def parseEtree(inFileName): rootNode = doc.getroot() rootTag, rootClass = get_root_tag(rootNode) if rootClass is None: - rootTag = 'email_message' + rootTag = 'Email_Message' rootClass = EmailMessageObjectType rootObj = rootClass.factory() rootObj.build(rootNode) @@ -1100,14 +1100,14 @@ def parseString(inString): rootNode = doc.getroot() rootTag, rootClass = get_root_tag(rootNode) if rootClass is None: - rootTag = 'email_message' + rootTag = 'Email_Message' rootClass = EmailMessageObjectType rootObj = rootClass.factory() rootObj.build(rootNode) # Enable Python to collect the space used by the DOM. doc = None # sys.stdout.write('\n') -# rootObj.export(sys.stdout.write, 0, name_="email_message", +# rootObj.export(sys.stdout.write, 0, name_="Email_Message", # namespacedef_='') return rootObj diff --git a/cybox/bindings/win_task_object.py b/cybox/bindings/win_task_object.py index 23d245ce..a5c9f52a 100644 --- a/cybox/bindings/win_task_object.py +++ b/cybox/bindings/win_task_object.py @@ -1522,7 +1522,7 @@ def buildChildren(self, child_, node, nodeName_, fromsubclass_=False): 'Fuzzy_Hash_Value': cybox_common.FuzzyHashValueType, 'Show_Message_Title': cybox_common.StringObjectPropertyType, 'Data_Size': cybox_common.DataSizeType, - 'email_message': email_message_object.EmailMessageObjectType, + 'Email_Message': email_message_object.EmailMessageObjectType, 'Dependency_Description': cybox_common.StructuredTextType, 'File': email_message_object.AttachmentReferenceType, 'Contributor': cybox_common.ContributorType,