code update for Python3

.gitattributes

@@ -0,0 +1,2 @@
+*.html  linguist-vendored=true
+*.css  linguist-vendored=true

requirements.txt

@@ -1,2 +1,7 @@
-Flask==0.10.1
--e git+https://github.com/threatstream/hpfeeds/#egg=hpfeeds-dev
+Click==7.0
+Flask==1.0.2
+itsdangerous==1.1.0
+Jinja2==2.10
+MarkupSafe==1.1.0
+Werkzeug==0.14.1
+-e git+https://github.com/threatstream/hpfeeds/#egg=hpfeeds-dev

wordpot.py

@@ -3,8 +3,8 @@
 try:
     from flask import Flask
 except ImportError:
-    print "\n[X] Please install Flask:"
-    print "   $ pip install flask\n"
+    print("\n[X] Please install Flask:")
+    print("   $ pip install flask\n")
     exit()
 
 from wordpot import app, pm, parse_options, check_options 

wordpot/__init__.py

@@ -3,8 +3,8 @@
 try:
     from flask import Flask
 except ImportError:
-    print "\n[X] Please install Flask:"
-    print "   $ pip install flask\n"
+    print("\n[X] Please install Flask:")
+    print("   $ pip install flask\n")
     exit()
 
 from optparse import OptionParser
@@ -50,15 +50,15 @@ def parse_options():
 
     (options, args) = parser.parse_args()
 
-    for opt, val in options.__dict__.iteritems():
+    for opt, val in options.__dict__.items():
         if val is not None:
             if opt in ['PLUGINS', 'THEMES']:
                 val = [ v.strip() for v in val.split(',') ] 
             app.config[opt] = val
 
 
 def check_options():
-    for k, v in REQUIRED_OPTIONS.iteritems():
+    for k, v in REQUIRED_OPTIONS.items():
         if k not in app.config:
             LOGGER.error('%s was not set. Falling back to default: %s', k, v)
             app.config[k] = v
@@ -87,7 +87,7 @@ def check_options():
 
 if app.config['HPFEEDS_ENABLED']:
     import hpfeeds
-    print 'Connecting to hpfeeds broker {}:{}'.format(app.config['HPFEEDS_HOST'], app.config['HPFEEDS_PORT'])
+    print('Connecting to hpfeeds broker {}:{}'.format(app.config['HPFEEDS_HOST'], app.config['HPFEEDS_PORT']))
     app.config['hpfeeds_client'] = hpfeeds.new(
         app.config['HPFEEDS_HOST'], 
         app.config['HPFEEDS_PORT'], 

wordpot/plugins_manager.py

@@ -3,7 +3,7 @@
 from flask import request
 from wordpot.logger import *
 import os
-import ConfigParser
+import configparser
 
 CURRENTPATH = os.path.abspath(os.path.dirname(__file__))
 
@@ -59,7 +59,7 @@ def __init__(self, slug=None):
     def _load_config(self, slug=None):
         self.slug = slug
         try:
-            config = ConfigParser.ConfigParser()
+            config = configparser.ConfigParser()
             plugin_config = os.path.join(CURRENTPATH, 'plugins/%s.ini' % self.slug)
 
             config.read(plugin_config)
@@ -71,7 +71,7 @@ def _load_config(self, slug=None):
             self.version = config.get('plugin', 'version')
 
             self.hooks = [v.strip() for v in config.get('plugin', 'hooks').split(',')]
-        except Exception, e:
+        except Exception as e:
             pass
 
     def start(self, **kwargs):
@@ -80,11 +80,11 @@ def start(self, **kwargs):
         self.outputs = {}
 
         # Parse arguments 
-        for k, v in kwargs.iteritems():
+        for k, v in kwargs.items():
             self.inputs[k] = v
         try:
             self.run()
-        except Exception, e:
+        except Exception as e:
             LOGGER.error('Unable to run plugin: %s\n%s', self.name, e.message)
 
     def run(self):