resolve python 3 errors

.travis.yml

@@ -2,6 +2,7 @@ language: python
 
 python:
   - "2.7"
+  - "3.6"
 
 install:
   - "pip install -r requirements.txt"

dagobah/backend/mongo.py

@@ -96,7 +96,9 @@ def is_object_id(o):
     def commit_dagobah(self, dagobah_json):
         dagobah_json['_id'] = dagobah_json['dagobah_id']
         append = {'save_date': datetime.utcnow()}
-        self.dagobah_coll.save(dict(dagobah_json.items() + append.items()))
+        result_dict = dagobah_json.copy()
+        result_dict.update(append)
+        self.dagobah_coll.save(result_dict)
 
     def delete_dagobah(self, dagobah_id):
         """ Deletes the Dagobah and all child Jobs from the database.
@@ -114,7 +116,9 @@ def delete_dagobah(self, dagobah_id):
     def commit_job(self, job_json):
         job_json['_id'] = job_json['job_id']
         append = {'save_date': datetime.utcnow()}
-        self.job_coll.save(dict(job_json.items() + append.items()))
+        result_dict = job_json.copy()
+        result_dict.update(append)
+        self.job_coll.save(result_dict)
 
     def delete_job(self, job_id):
         self.job_coll.remove({'_id': job_id})

dagobah/core/components.py

@@ -118,6 +118,8 @@ def default(self, o):
             from bson import ObjectId
             if isinstance(o, ObjectId):
                 return str(o)
+            if isinstance(o, bytes):
+                return str(o)
         except ImportError:
             pass
         if isinstance(o, datetime):

dagobah/daemon/auth.py

@@ -31,7 +31,7 @@ def do_login():
     """ Attempt to auth using single login. Rate limited at the site level. """
 
     dt_filter = lambda x: x >= datetime.utcnow() - timedelta(seconds=60)
-    app.config['AUTH_ATTEMPTS'] = filter(dt_filter, app.config['AUTH_ATTEMPTS'])
+    app.config['AUTH_ATTEMPTS'] = list(filter(dt_filter, app.config['AUTH_ATTEMPTS']))
 
     if len(app.config['AUTH_ATTEMPTS']) > app.config['AUTH_RATE_LIMIT']:
         return redirect(url_for('login',

dagobah/daemon/util.py

@@ -24,6 +24,8 @@ def default(self, obj):
         try:
             if isinstance(obj, ObjectId):
                 return str(obj)
+            if isinstance(obj, bytes):
+                return  str(obj)
         except NameError:
             pass
 

dagobah/email/basic.py

@@ -2,7 +2,7 @@
 
 from datetime import datetime
 # noinspection PyUnresolvedReferences
-from email.MIMEMultipart import MIMEMultipart
+from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 
 import premailer