From 9cc55341f0e1f98f17e1a460b1c0fbace4bbe3e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A9borah=20Servili?=
 <Delta-Sierra@users.noreply.github.com>
Date: Wed, 12 Oct 2016 15:40:49 +0200
Subject: [PATCH] fix date formatting in mispevent.py + some PEP8 cleaning

---
 examples/events/tools.py | 36 +++++++++++++++++++++++-------------
 pymisp/mispevent.py      |  2 +-
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/examples/events/tools.py b/examples/events/tools.py
index 322aace..9d0e3f5 100644
--- a/examples/events/tools.py
+++ b/examples/events/tools.py
@@ -5,60 +5,70 @@ import random
 from random import randint
 import string
 
+
 def randomStringGenerator(size, chars=string.ascii_lowercase + string.digits):
     return ''.join(random.choice(chars) for _ in range(size))
 
+
 def randomIpGenerator():
     return str(randint(0, 255)) + '.' + str(randint(0, 255)) + '.' + str(randint(0, 255)) + '.' + str(randint(0, 255))
 
-def floodtxt(misp, event, maxlength = 255):
+
+def floodtxt(misp, event, maxlength=255):
     text = randomStringGenerator(randint(1, maxlength))
     textfunctions = [misp.add_internal_comment, misp.add_internal_text, misp.add_internal_other, misp.add_email_subject, misp.add_mutex, misp.add_filename]
-    textfunctions[randint(0,5)](event, text)
+    textfunctions[randint(0, 5)](event, text)
+
 
 def floodip(misp, event):
     ip = randomIpGenerator()
     ipfunctions = [misp.add_ipsrc, misp.add_ipdst]
-    ipfunctions[randint(0,1)](event, ip)
+    ipfunctions[randint(0, 1)](event, ip)
 
-def flooddomain(misp, event, maxlength = 25):
+
+def flooddomain(misp, event, maxlength=25):
     a = randomStringGenerator(randint(1, maxlength))
     b = randomStringGenerator(randint(2, 3), chars=string.ascii_lowercase)
     domain = a + '.' + b
     domainfunctions = [misp.add_hostname, misp.add_domain]
-    domainfunctions[randint(0,1)](event, domain)
+    domainfunctions[randint(0, 1)](event, domain)
 
-def flooddomainip(misp, event, maxlength = 25):
+
+def flooddomainip(misp, event, maxlength=25):
     a = randomStringGenerator(randint(1, maxlength))
     b = randomStringGenerator(randint(2, 3), chars=string.ascii_lowercase)
     domain = a + '.' + b
     ip = randomIpGenerator()
     misp.add_domain_ip(event, domain, ip)
 
-def floodemail(misp, event, maxlength = 25):
+
+def floodemail(misp, event, maxlength=25):
     a = randomStringGenerator(randint(1, maxlength))
     b = randomStringGenerator(randint(1, maxlength))
     c = randomStringGenerator(randint(2, 3), chars=string.ascii_lowercase)
-    email = a + '@' + b + '.'+ c
+    email = a + '@' + b + '.' + c
     emailfunctions = [misp.add_email_src, misp.add_email_dst]
-    emailfunctions[randint(0,1)](event, email)
+    emailfunctions[randint(0, 1)](event, email)
+
 
 def floodattachment(misp, eventid, distribution, to_ids, category, comment, info, analysis, threat_level_id):
-    filename = randomStringGenerator(randint(1,128))
+    filename = randomStringGenerator(randint(1, 128))
     misp.upload_sample(filename, 'dummy', eventid, distribution, to_ids, category, comment, info, analysis, threat_level_id)
 
+
 def create_dummy_event(misp):
     event = misp.new_event(0, 4, 0, 'dummy event')
     flooddomainip(misp, event)
-    floodattachment(misp, event['Event']['id'], event['Event']['id'], event['Event']['distribution'], False, 'Payload delivery', '', event['Event']['info'], event['Event']['analysis'], event['Event']['threat_level_id'])
+    floodattachment(misp, event['Event']['id'], event['Event']['distribution'], False, 'Payload delivery', '', event['Event']['info'], event['Event']['analysis'], event['Event']['threat_level_id'])
+
 
 def create_massive_dummy_events(misp, nbattribute):
     event = misp.new_event(0, 4, 0, 'massive dummy event')
     eventid = event['Event']['id']
     functions = [floodtxt, floodip, flooddomain, flooddomainip, floodemail, floodattachment]
     for i in range(nbattribute):
-        choice = randint(0,5)
+        choice = randint(0, 5)
         if choice == 5:
             floodattachment(misp, eventid, event['Event']['distribution'], False, 'Payload delivery', '', event['Event']['info'], event['Event']['analysis'], event['Event']['threat_level_id'])
         else:
-            functions[choice](misp,event)
+            functions[choice](misp, event)
diff --git a/pymisp/mispevent.py b/pymisp/mispevent.py
index 87c259f..12e22cd 100644
--- a/pymisp/mispevent.py
+++ b/pymisp/mispevent.py
@@ -254,7 +254,7 @@ class MISPEvent(object):
             self.publish()
         if kwargs.get('date'):
             if isinstance(kwargs['date'], basestring):
-                self.date = parse(kwargs['date'])
+                self.date = parse(kwargs['date']).date()
             elif isinstance(kwargs['date'], datetime.datetime):
                 self.date = kwargs['date'].date()
             elif isinstance(kwargs['date'], datetime.date):