Some more refactoring

pymisp/mispevent.py

@@ -10,7 +10,6 @@ import base64
 from io import BytesIO
 from zipfile import ZipFile
 import hashlib
-import abc
 import sys
 import uuid
 from collections import Counter
@@ -796,13 +795,3 @@ class MISPObject(AbstractMISP):
         attribute.from_dict(object_relation, **value)
         self.Attribute.append(attribute)
         return attribute
-
-
-@six.add_metaclass(abc.ABCMeta)   # Remove that line when discarding python2 support.
-# Python3 way: class MISPObjectGenerator(metaclass=abc.ABCMeta):
-class AbstractMISPObjectGenerator(MISPObject):
-
-    @abc.abstractmethod
-    def generate_attributes(self):
-        """Contains the logic where all the values of the object are gathered"""
-        pass

pymisp/tools/abstractgenerator.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import abc
+import six
+from .. import MISPObject
+
+
+@six.add_metaclass(abc.ABCMeta)   # Remove that line when discarding python2 support.
+# Python3 way: class MISPObjectGenerator(metaclass=abc.ABCMeta):
+class AbstractMISPObjectGenerator(MISPObject):
+
+    @abc.abstractmethod
+    def generate_attributes(self):
+        """Contains the logic where all the values of the object are gathered"""
+        pass

pymisp/tools/elfobject.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from .. import AbstractMISPObjectGenerator
+from .abstractgenerator import AbstractMISPObjectGenerator
 from io import BytesIO
 from hashlib import md5, sha1, sha256, sha512
 import warnings

pymisp/tools/fileobject.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from .. import AbstractMISPObjectGenerator
+from .abstractgenerator import AbstractMISPObjectGenerator
 import os
 from io import BytesIO
 from hashlib import md5, sha1, sha256, sha512

pymisp/tools/machoobject.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from .. import AbstractMISPObjectGenerator
+from .abstractgenerator import AbstractMISPObjectGenerator
 from io import BytesIO
 from hashlib import md5, sha1, sha256, sha512
 import warnings

pymisp/tools/peobject.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from .. import AbstractMISPObjectGenerator
+from .abstractgenerator import AbstractMISPObjectGenerator
 from io import BytesIO
 from hashlib import md5, sha1, sha256, sha512
 from datetime import datetime