Merge pull request #9 from Rafiot/master

Please PEP8 on all expansions

modules/expansion/circl_passivedns.py

@@ -1,9 +1,9 @@
 import json
 import pypdns
 
-misperrors = {'error' : 'Error'}
-mispattributes = {'input': ['hostname', 'domain','ip-src','ip-dst'], 'output': ['freetext']}
-moduleinfo = {'version': '0.1', 'author': 'Alexandre Dulaunoy', 'description': 'Module to access CIRCL Passive DNS',  'module-type': ['expansion','hover']}
+misperrors = {'error': 'Error'}
+mispattributes = {'input': ['hostname', 'domain', 'ip-src', 'ip-dst'], 'output': ['freetext']}
+moduleinfo = {'version': '0.1', 'author': 'Alexandre Dulaunoy', 'description': 'Module to access CIRCL Passive DNS', 'module-type': ['expansion', 'hover']}
 moduleconfig = ['username', 'password']
 
 
@@ -34,7 +34,7 @@ def handler(q=False):
     for v in res:
             out = out + "{} ".format(v['rdata'])
 
-    r = {'results': [{'types': mispattributes['output'], 'values': out }]}
+    r = {'results': [{'types': mispattributes['output'], 'values': out}]}
     return r
 
 

modules/expansion/cve.py

@@ -17,7 +17,7 @@ def handler(q=False):
         misperrors['error'] = 'Vulnerability id missing'
         return misperrors
 
-    r = requests.get(cveapi_url+request.get('vulnerability'))
+    r = requests.get(cveapi_url + request.get('vulnerability'))
     if r.status_code == 200:
         vulnerability = json.loads(r.text)
         if vulnerability.get('summary'):

modules/expansion/passivetotal.py

@@ -344,4 +344,3 @@ def introspection():
 def version():
     moduleinfo['config'] = moduleconfig
     return moduleinfo
-

modules/expansion/sourcecache.py

@@ -35,6 +35,7 @@ def __archiveLink(archive_path, tocache):
     archiver = url_archiver.Archive(archive_path=archive_path)
     return archiver.fetch(url=tocache, armor=True)
 
+
 def introspection():
     return mispattributes