Skip to content

Commit

Permalink
Undo capitalization change of Email_Message.
Browse files Browse the repository at this point in the history
Partially revert ce549b8
  • Loading branch information
gtback committed May 28, 2015
1 parent 9210af1 commit 8327de6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions cybox/bindings/email_message_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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('<?xml version="1.0" ?>\n')
# rootObj.export(sys.stdout.write, 0, name_="email_message",
# rootObj.export(sys.stdout.write, 0, name_="Email_Message",
# namespacedef_='')
return rootObj

Expand Down
2 changes: 1 addition & 1 deletion cybox/bindings/win_task_object.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 8327de6

Please sign in to comment.