fix for updates on pdns 4.0.0-rc2+ and remove flask.ext deprecation warnings

app/lib/utils.py

@@ -64,6 +64,9 @@ def fetch_json(remote_url, method='GET', data=None, params=None, headers=None):
     if method == "DELETE":
         return True
 
+    if r.status_code == 204:
+        return {}
+
     try:
         assert('json' in r.headers['content-type'])
     except Exception as e:

app/models.py

@@ -10,7 +10,7 @@ import onetimepass
 
 from datetime import datetime
 from distutils.version import StrictVersion
-from flask.ext.login import AnonymousUserMixin
+from flask_login import AnonymousUserMixin
 
 from app import app, db
 from lib import utils
@@ -720,7 +720,7 @@ class Record(object):
         if check:
             r = check[0]
             if r['type'] in ('A', 'AAAA' ,'CNAME'):
-                return {'status': 'error', 'msg': 'Record might was already exist with type "A", "AAAA", "CNAME"'}
+                return {'status': 'error', 'msg': 'Record already exists with type "A", "AAAA" or "CNAME"'}
 
         # continue if the record is ready to be added
         headers = {}
@@ -896,10 +896,10 @@ class Record(object):
             headers = {}
             headers['X-API-Key'] = PDNS_API_KEY
             jdata1 = utils.fetch_json(urlparse.urljoin(PDNS_STATS_URL, API_EXTENDED_URL + '/servers/localhost/zones/%s' % domain), headers=headers, method='PATCH', data=postdata_for_delete)
-            logging.debug('jdata1: ', jdata1)
+#            logging.debug('jdata1: ', jdata1)
 
             jdata2 = utils.fetch_json(urlparse.urljoin(PDNS_STATS_URL, API_EXTENDED_URL + '/servers/localhost/zones/%s' % domain), headers=headers, method='PATCH', data=postdata_for_new)
-            logging.debug('jdata2: ', jdata2)
+#            logging.debug('jdata2: ', jdata2)
 
             if 'error' in jdata2.keys():
                 logging.error('Cannot apply record changes.')
@@ -1174,4 +1174,4 @@ class Setting(db.Model):
             logging.error('Cannot edit setting %s' % setting)
             logging.debug(traceback.format_exec())
             db.session.rollback()
-            return False
+            return False

app/views.py

@@ -6,7 +6,7 @@ import pyqrcode
 import base64
 
 from functools import wraps
-from flask.ext.login import login_user, logout_user, current_user, login_required
+from flask_login import login_user, logout_user, current_user, login_required
 from flask import Flask, g, request, make_response, jsonify, render_template, session, redirect, url_for, send_from_directory
 from werkzeug import secure_filename