Fixed deprecated import style. Fixed bug in radix package version check

datacenter · Aug 21, 2019 · b4b65e8 · b4b65e8
1 parent 73975c1
commit b4b65e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/applications/connection_search/Forms.py b/applications/connection_search/Forms.py
@@ -20,7 +20,7 @@
 """
 Forms for report GUI
 """
-from flask.ext.wtf import Form
+from flask_wtf import Form
 from wtforms import StringField, SubmitField, PasswordField, BooleanField
 from wtforms import TextAreaField, SelectField
 from wtforms.validators import IPAddress

diff --git a/applications/connection_search/aciConSearch.py b/applications/connection_search/aciConSearch.py
@@ -38,8 +38,10 @@
 from acitoolkit.aciphysobject import Session
 from acitoolkit.acitoolkit import BaseTerminal, InputTerminal, AnyEPG
 from acitoolkit.acitoolkitlib import Credentials
+from distutils.version import StrictVersion
 
-if radix.__version__ < '0.9.5':
+
+if StrictVersion(radix.__version__) < StrictVersion('0.9.5'):
     raise AssertionError("!!! Please upgrade your py-radix to a version later than 0.9.4.  "
                          "You are running {0}!!!".format(radix.__version__))
 

diff --git a/applications/connection_search/aciConSearchGui.py b/applications/connection_search/aciConSearchGui.py
@@ -25,10 +25,10 @@
 from copy import copy
 from flask import Flask, session, redirect, url_for, jsonify
 from flask import flash, request
-from flask.ext import admin
-from flask.ext.admin import BaseView, AdminIndexView, expose
-from flask.ext.bootstrap import Bootstrap
-from flask.ext.wtf import Form, CsrfProtect
+import flask_admin as admin
+from flask_admin import BaseView, AdminIndexView, expose
+from flask_bootstrap import Bootstrap
+from flask_wtf import Form, CsrfProtect
 from acitoolkit.acitoolkitlib import Credentials
 from acitoolkit.acisession import Session, CredentialsError
 from requests import Timeout, ConnectionError