fix: readme update + python3 + pep8

align python path to readme specifying python3

examples/feed-generator/README.md

@@ -5,9 +5,26 @@ This python script can be used to generate a MISP feed based on an existing MISP
 # Installation
 
 ````
-git clone https://github.com/CIRCL/PyMISP
+git clone https://github.com/MISP/PyMISP.git
 cd examples/feed-generator
 cp settings-default.py settings.py
 vi settings.py #adjust your settings
 python3 generate.py
 ````
+
+# Output
+
+The generated feed will be stored in your `outputdir`.
+It contains the files:
+- `manifest.json` - containing the feed manifest (generic event information)
+- `hashes.csv` - listing the hashes of the attribute values
+- `*.json` - a large amount of `json` files 
+
+
+# Importing in MISP
+
+To import this feed into your MISP instance:
+- Sync Actions > List Feeds > Add feed
+- Fill in the form while ensuring the 'source format' is set to 'MISP Feed'
+
+For more information about feeds please read: https://misp.gitbooks.io/misp-book/content/managing-feeds/

examples/feed-generator/generate.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 import sys
@@ -79,15 +79,17 @@ valid_attribute_distributions = []
 
 attributeHashes = []
 
+
 def init():
     # If we have an old settings.py file then this variable won't exist
     global valid_attribute_distributions
     try:
         valid_attribute_distributions = valid_attribute_distribution_levels
-    except:
+    except Exception:
         valid_attribute_distributions = ['0', '1', '2', '3', '4', '5']
     return PyMISP(url, key, ssl)
 
+
 def recursiveExtract(container, containerType, leaf, eventUuid):
     temp = {}
     if containerType in ['Attribute', 'Object']:
@@ -118,8 +120,8 @@ def recursiveExtract(container, containerType, leaf, eventUuid):
                         temp[childType].append(processed)
     return temp
 
+
 def saveEvent(misp, uuid):
-    result = {}
     event = misp.get_event(uuid)
     if not event.get('Event'):
         print('Error while fetching event: {}'.format(event['message']))
@@ -130,11 +132,13 @@ def saveEvent(misp, uuid):
     eventFile.write(event)
     eventFile.close()
 
+
 def __blockByDistribution(element):
     if element['distribution'] not in valid_attribute_distributions:
         return True
     return False
 
+
 def saveHashes():
     if not attributeHashes:
         return False
@@ -148,7 +152,6 @@ def saveHashes():
         sys.exit('Could not create the quick hash lookup file.')
 
 
-
 def saveManifest(manifest):
     try:
         manifestFile = open(os.path.join(outputdir, 'manifest.json'), 'w')