From e74b4a5bff91875879f743844d414a8b75b92dfc Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Wed, 29 May 2019 08:42:39 +0900 Subject: [PATCH] fix: [isort] isort source files: https://github.com/timothycrosley/isort/wiki/isort-Plugins --- helpers/contributor_helper.py | 16 +++++++++------- helpers/geo_helper.py | 19 +++++++++++-------- helpers/live_helper.py | 7 ++++--- helpers/trendings_helper.py | 11 +++++++---- helpers/users_helper.py | 9 ++++++--- tests/test_geo.py | 10 +++++++--- tests/test_trendings.py | 11 ++++++++--- tests/test_users.py | 11 ++++++++--- 8 files changed, 60 insertions(+), 34 deletions(-) diff --git a/helpers/contributor_helper.py b/helpers/contributor_helper.py index 671eed3..5dd6abc 100644 --- a/helpers/contributor_helper.py +++ b/helpers/contributor_helper.py @@ -1,16 +1,19 @@ -import util -from util import getZrange -import math, random -import time -import os import configparser -import json import datetime +import json import logging +import math +import os +import random +import time + import redis import util +from util import getZrange + from . import users_helper + KEYDAY = "CONTRIB_DAY" # To be used by other module KEYALLORG = "CONTRIB_ALL_ORG" # To be used by other module @@ -589,4 +592,3 @@ class Contributor_helper: return { 'remainingPts': i-points, 'stepPts': prev } prev = i return { 'remainingPts': 0, 'stepPts': self.rankMultiplier**self.levelMax } - diff --git a/helpers/geo_helper.py b/helpers/geo_helper.py index d45e6f3..57a0065 100644 --- a/helpers/geo_helper.py +++ b/helpers/geo_helper.py @@ -1,18 +1,21 @@ -import math, random -import os +import datetime import json -import datetime, time import logging -import json -import redis +import math +import os +import random +import time from collections import OrderedDict -import geoip2.database -import phonenumbers, pycountry -from phonenumbers import geocoder +import redis +import geoip2.database +import phonenumbers +import pycountry import util from helpers import live_helper +from phonenumbers import geocoder + class InvalidCoordinate(Exception): pass diff --git a/helpers/live_helper.py b/helpers/live_helper.py index 985bca8..31af76b 100644 --- a/helpers/live_helper.py +++ b/helpers/live_helper.py @@ -1,8 +1,9 @@ -import os +import datetime import json -import random -import datetime, time import logging +import os +import random +import time class Live_helper: diff --git a/helpers/trendings_helper.py b/helpers/trendings_helper.py index 61e1479..e19292c 100644 --- a/helpers/trendings_helper.py +++ b/helpers/trendings_helper.py @@ -1,13 +1,16 @@ -import math, random -import os -import json import copy -import datetime, time +import datetime +import json import logging +import math +import os +import random +import time from collections import OrderedDict import util + class Trendings_helper: def __init__(self, serv_redis_db, cfg): self.serv_redis_db = serv_redis_db diff --git a/helpers/users_helper.py b/helpers/users_helper.py index 440ad39..f38b1f9 100644 --- a/helpers/users_helper.py +++ b/helpers/users_helper.py @@ -1,10 +1,13 @@ -import math, random -import os +import datetime import json -import datetime, time import logging +import math +import os +import random +import time import util + from . import contributor_helper diff --git a/tests/test_geo.py b/tests/test_geo.py index 94b9801..4c75b3d 100755 --- a/tests/test_geo.py +++ b/tests/test_geo.py @@ -1,8 +1,13 @@ #!/usr/bin/env python3.5 import configparser -import redis -import sys,os import datetime +import os +import sys + +import redis + +from helpers import geo_helper + sys.path.append('..') configfile = 'test_config.cfg' @@ -14,7 +19,6 @@ serv_redis_db = redis.StrictRedis( port=6260, db=1) -from helpers import geo_helper geo_helper = geo_helper.Geo_helper(serv_redis_db, cfg) categ = 'Network Activity' diff --git a/tests/test_trendings.py b/tests/test_trendings.py index 4cce0e7..4716e05 100755 --- a/tests/test_trendings.py +++ b/tests/test_trendings.py @@ -1,8 +1,14 @@ #!/usr/bin/env python3.5 import configparser +import datetime +import os +import sys +import time + import redis -import sys,os -import datetime, time + +from helpers import trendings_helper + sys.path.append('..') configfile = 'test_config.cfg' @@ -14,7 +20,6 @@ serv_redis_db = redis.StrictRedis( port=6260, db=1) -from helpers import trendings_helper trendings_helper = trendings_helper.Trendings_helper(serv_redis_db, cfg) diff --git a/tests/test_users.py b/tests/test_users.py index 61e7b41..2eb6f71 100755 --- a/tests/test_users.py +++ b/tests/test_users.py @@ -1,8 +1,14 @@ #!/usr/bin/env python3.5 import configparser +import datetime +import os +import sys +import time + import redis -import sys,os -import datetime, time + +from helpers import users_helper + sys.path.append('..') configfile = 'test_config.cfg' @@ -14,7 +20,6 @@ serv_redis_db = redis.StrictRedis( port=6260, db=1) -from helpers import users_helper users_helper = users_helper.Users_helper(serv_redis_db, cfg)