PEP8 fixes.

This commit is contained in:
Khushboo Vashi
2018-03-02 09:37:11 +00:00
committed by Dave Page
parent cca6504d54
commit a4124c2496
7 changed files with 21 additions and 25 deletions

View File

@@ -8,7 +8,6 @@
########################################################################## ##########################################################################
"""A blueprint module implementing the about box.""" """A blueprint module implementing the about box."""
MODULE_NAME = 'about'
import sys import sys
from flask import Response, render_template, __version__, url_for from flask import Response, render_template, __version__, url_for
@@ -18,6 +17,8 @@ from pgadmin.utils import PgAdminModule
from pgadmin.utils.menu import MenuItem from pgadmin.utils.menu import MenuItem
import config import config
MODULE_NAME = 'about'
class AboutModule(PgAdminModule): class AboutModule(PgAdminModule):
def get_own_menuitems(self): def get_own_menuitems(self):

View File

@@ -65,7 +65,8 @@ class KeyboardShortcutFeatureTest(BaseFeatureTest):
Keys.ALT Keys.ALT
).perform() ).perform()
print("Executing shortcut: " + self.new_shortcuts[s]['locator'] + "...", file=sys.stderr, end="") print("Executing shortcut: " + self.new_shortcuts[s]['locator'] +
"...", file=sys.stderr, end="")
self.wait.until( self.wait.until(
EC.presence_of_element_located( EC.presence_of_element_located(

View File

@@ -21,10 +21,6 @@ from subprocess import Popen
from pgadmin.utils import IS_PY2, u, file_quote, fs_encoding from pgadmin.utils import IS_PY2, u, file_quote, fs_encoding
if IS_PY2:
from StringIO import StringIO
else:
from io import StringIO
import pytz import pytz
from dateutil import parser from dateutil import parser
from flask import current_app from flask import current_app
@@ -33,6 +29,10 @@ from flask_security import current_user
import config import config
from pgadmin.model import Process, db from pgadmin.model import Process, db
if IS_PY2:
from StringIO import StringIO
else:
from io import StringIO
def get_current_time(format='%Y-%m-%d %H:%M:%S.%f %z'): def get_current_time(format='%Y-%m-%d %H:%M:%S.%f %z'):

View File

@@ -7,6 +7,8 @@
# #
########################################################################## ##########################################################################
import os
import sys
from collections import defaultdict from collections import defaultdict
from operator import attrgetter from operator import attrgetter
@@ -153,9 +155,6 @@ class PgAdminModule(Blueprint):
return res return res
import os
import sys
IS_PY2 = (sys.version_info[0] == 2) IS_PY2 = (sys.version_info[0] == 2)
IS_WIN = (os.name == 'nt') IS_WIN = (os.name == 'nt')
@@ -316,4 +315,3 @@ SHORTCUT_FIELDS = [
'label': gettext('Alt/Option') 'label': gettext('Alt/Option')
} }
] ]

View File

@@ -9,16 +9,15 @@
import sys import sys
from pgadmin.utils.route import BaseTestGenerator
from pgadmin.utils.javascript.javascript_bundler import JavascriptBundler
from pgadmin.utils.javascript.javascript_bundler import JsState
if sys.version_info < (3, 3): if sys.version_info < (3, 3):
from mock import patch from mock import patch
else: else:
from unittest.mock import patch from unittest.mock import patch
from pgadmin.utils.route import BaseTestGenerator
from pgadmin.utils.javascript.javascript_bundler import JavascriptBundler
from pgadmin.utils.javascript.javascript_bundler import JsState
class JavascriptBundlerTestCase(BaseTestGenerator): class JavascriptBundlerTestCase(BaseTestGenerator):
"""This tests that the javascript bundler tool causes the application to """This tests that the javascript bundler tool causes the application to

View File

@@ -9,17 +9,17 @@
import traceback import traceback
import sys import sys
from abc import ABCMeta, abstractmethod
from importlib import import_module
from werkzeug.utils import find_modules
import config
import six
if sys.version_info < (2, 7): if sys.version_info < (2, 7):
import unittest2 as unittest import unittest2 as unittest
else: else:
import unittest import unittest
from abc import ABCMeta, abstractmethod
from importlib import import_module
from werkzeug.utils import find_modules
import config
class TestsGeneratorRegistry(ABCMeta): class TestsGeneratorRegistry(ABCMeta):
""" """
@@ -76,9 +76,6 @@ class TestsGeneratorRegistry(ABCMeta):
traceback.print_exc(file=sys.stderr) traceback.print_exc(file=sys.stderr)
import six
@six.add_metaclass(TestsGeneratorRegistry) @six.add_metaclass(TestsGeneratorRegistry)
class BaseTestGenerator(unittest.TestCase): class BaseTestGenerator(unittest.TestCase):
# Defining abstract method which will override by individual testcase. # Defining abstract method which will override by individual testcase.