From 9d4cdd7e16830e34b274387db8b53f7f05c78b8d Mon Sep 17 00:00:00 2001 From: Steve Clement Date: Wed, 29 May 2019 08:30:57 +0900 Subject: [PATCH] chg: [sort] isort on source files fix: [typo] fix retreive to retrieve --- clean.py | 8 +++---- give_honors_to_org.py | 10 +++++--- helpers/users_helper.py | 6 ++--- retreive_map_pic.py => retrieve_map_pic.py | 12 ++++++---- server.py | 24 +++++++++---------- static/js/trendings.js | 2 +- util.py | 3 ++- zmq_dispatcher.py | 27 +++++++++++----------- zmq_subscriber.py | 14 ++++++----- 9 files changed, 57 insertions(+), 49 deletions(-) rename retreive_map_pic.py => retrieve_map_pic.py (98%) diff --git a/clean.py b/clean.py index 061321d..0db079c 100755 --- a/clean.py +++ b/clean.py @@ -1,11 +1,11 @@ #!/usr/bin/env python3 -from pprint import pprint -import os -import redis -import configparser import argparse +import configparser +import os +from pprint import pprint +import redis RED="\033[91m" GREEN="\033[92m" diff --git a/give_honors_to_org.py b/give_honors_to_org.py index f154f73..9279e64 100755 --- a/give_honors_to_org.py +++ b/give_honors_to_org.py @@ -1,9 +1,13 @@ #!/usr/bin/env python3.5 -import os, sys, json -import datetime, time -import redis import configparser +import datetime +import json +import os +import sys +import time + +import redis import util from helpers import contributor_helper diff --git a/helpers/users_helper.py b/helpers/users_helper.py index 5fe8b90..440ad39 100644 --- a/helpers/users_helper.py +++ b/helpers/users_helper.py @@ -63,11 +63,11 @@ class Users_helper: else: break # timestamps should be sorted, no need to process anymore return to_return - + # return: All dates for all orgs, if date is not supplied, return for all dates def getUserLogins(self, date=None): - # get all orgs and retreive their timestamps + # get all orgs and retrieve their timestamps dates = [] for org in self.getAllOrg(): keyname = "{}:{}".format(self.keyOrgLog, org) @@ -169,7 +169,7 @@ class Users_helper: data = [data[6]]+data[:6] return data - # return: a dico of the form {login: [[timestamp, count], ...], contrib: [[timestamp, 1/0], ...]} + # return: a dico of the form {login: [[timestamp, count], ...], contrib: [[timestamp, 1/0], ...]} # either for all orgs or the supplied one def getUserLoginsAndContribOvertime(self, date, org=None, prev_days=6): dico_hours_contrib = {} diff --git a/retreive_map_pic.py b/retrieve_map_pic.py similarity index 98% rename from retreive_map_pic.py rename to retrieve_map_pic.py index 55929a1..e8dd22e 100755 --- a/retreive_map_pic.py +++ b/retrieve_map_pic.py @@ -1,13 +1,15 @@ #!/usr/bin/env python3.5 -import redis -import requests -import shutil import json import math -import sys, os +import os +import shlex +import shutil +import sys import time from subprocess import PIPE, Popen -import shlex + +import redis +import requests URL_OPEN_MAP = "http://tile.openstreetmap.org/{zoom}/{x}/{y}.png" MAP_DIR = "static/maps/" diff --git a/server.py b/server.py index 8a1943f..f8ace13 100755 --- a/server.py +++ b/server.py @@ -1,21 +1,21 @@ #!/usr/bin/env python3 -from flask import Flask, render_template, request, Response, jsonify, stream_with_context -import json -import redis -import random, math import configparser +import datetime +import json +import logging +import math +import os +import random from time import gmtime as now from time import sleep, strftime -import datetime -import os -import logging + +import redis import util -from helpers import geo_helper -from helpers import contributor_helper -from helpers import users_helper -from helpers import trendings_helper -from helpers import live_helper +from flask import (Flask, Response, jsonify, render_template, request, + stream_with_context) +from helpers import (contributor_helper, geo_helper, live_helper, + trendings_helper, users_helper) configfile = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'config/config.cfg') cfg = configparser.ConfigParser() diff --git a/static/js/trendings.js b/static/js/trendings.js index d87aeae..b2ea959 100644 --- a/static/js/trendings.js +++ b/static/js/trendings.js @@ -145,7 +145,7 @@ function getTextColour(rgb) { } } -// If json (from tag), only retreive the name> otherwise return the supplied arg. +// If json (from tag), only retrieve the name> otherwise return the supplied arg. function getOnlyName(potentialJson) { try { jsonLabel = JSON.parse(potentialJson); diff --git a/util.py b/util.py index 6f6d0db..e61984c 100644 --- a/util.py +++ b/util.py @@ -1,5 +1,6 @@ +import datetime +import time from collections import defaultdict -import datetime, time ONE_DAY = 60*60*24 diff --git a/zmq_dispatcher.py b/zmq_dispatcher.py index 37a3874..3f94b81 100755 --- a/zmq_dispatcher.py +++ b/zmq_dispatcher.py @@ -1,23 +1,22 @@ #!/usr/bin/env python3 -import time, datetime -import copy -import logging -import zmq -import redis -import random -import configparser import argparse -import os -import sys +import configparser +import copy +import datetime import json +import logging +import os +import random +import sys +import time + +import redis +import zmq import util -from helpers import geo_helper -from helpers import contributor_helper -from helpers import users_helper -from helpers import trendings_helper -from helpers import live_helper +from helpers import (contributor_helper, geo_helper, live_helper, + trendings_helper, users_helper) configfile = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'config/config.cfg') cfg = configparser.ConfigParser() diff --git a/zmq_subscriber.py b/zmq_subscriber.py index b642333..97b2a71 100755 --- a/zmq_subscriber.py +++ b/zmq_subscriber.py @@ -1,14 +1,16 @@ #!/usr/bin/env python3 -import time, datetime -import zmq -import logging -import redis -import configparser import argparse +import configparser +import datetime +import json +import logging import os import sys -import json +import time + +import redis +import zmq configfile = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'config/config.cfg') cfg = configparser.ConfigParser()