Fix PEP-8 issues in feature_tests, dashboard, about and misc module's python code. Fixes #3082

This commit is contained in:
Murtuza Zabuawala
2018-02-09 12:57:37 +00:00
committed by Dave Page
parent 942ac733a4
commit 6f25f4d175
17 changed files with 634 additions and 361 deletions

View File

@@ -11,32 +11,31 @@
MODULE_NAME = 'about'
import sys
from flask import Response, render_template, __version__, url_for
from flask_babel import gettext
from flask_security import current_user, login_required
from pgadmin.utils import PgAdminModule
from pgadmin.utils.menu import MenuItem
import config
class AboutModule(PgAdminModule):
def get_own_menuitems(self):
appname = config.APP_NAME
if hasattr(str, 'decode'):
appname = appname.decode('utf-8')
return {
'help_items': [
MenuItem(name='mnu_about',
priority=999,
module="pgAdmin.About",
callback='about_show',
icon='fa fa-info-circle',
label=gettext(u'About %(appname)s',
appname=appname
)
)
MenuItem(
name='mnu_about',
priority=999,
module="pgAdmin.About",
callback='about_show',
icon='fa fa-info-circle',
label=gettext(u'About %(appname)s', appname=appname)
)
]
}
@@ -50,8 +49,8 @@ class AboutModule(PgAdminModule):
def get_exposed_url_endpoints(self):
return ['about.index']
blueprint = AboutModule(MODULE_NAME, __name__,
static_url_path='')
blueprint = AboutModule(MODULE_NAME, __name__, static_url_path='')
##########################################################################
@@ -61,20 +60,29 @@ blueprint = AboutModule(MODULE_NAME, __name__,
@login_required
def index():
"""Render the about box."""
info = {'python_version': sys.version, 'flask_version': __version__}
if config.SERVER_MODE is True:
info = {
'python_version': sys.version,
'flask_version': __version__
}
if config.SERVER_MODE:
info['app_mode'] = gettext('Server')
else:
info['app_mode'] = gettext('Desktop')
info['current_user'] = current_user.email
return render_template(MODULE_NAME + '/index.html', info=info, _=gettext)
return render_template(
MODULE_NAME + '/index.html', info=info, _=gettext
)
@blueprint.route("/about.js")
@login_required
def script():
"""render the required javascript"""
return Response(response=render_template("about/about.js", _=gettext),
status=200,
mimetype="application/javascript")
return Response(
response=render_template("about/about.js", _=gettext),
status=200,
mimetype="application/javascript"
)