Changeset - b491f9fa59bd
[Not reviewed]
default
0 3 0
Dennis Fink - 11 years ago 2014-01-23 11:07:03
dennis.fink@c3l.lu
added encoding parameter to open
3 files changed with 5 insertions and 4 deletions:
0 comments (0 inline, 0 general)
ennstatus/api/functions.py
Show inline comments
 
@@ -66,30 +66,31 @@ def check_json_format(server):
 
    return True
 

	
 

	
 
def update_server(server, ip):
 

	
 
    server['last_updated'] = datetime.utcnow().strftime(DATE_FORMAT)
 
    server['server_status'] = 'Online'
 
    server['country'] = gi4.country_name_by_addr(ip)
 

	
 
    if server['server_type'] == 'Bridge':
 
        server['obfs'] = literal_eval(server['obfs'])
 

	
 
        for key in ('fingerprint', 'ip'):
 
            if key in server:
 
                del server[key]
 

	
 
    else:
 
        if 'obfs' in server:
 
            del server['obfs']
 

	
 
        server['ip'] = ip
 

	
 
    try:
 
        filename = ''.join(['data/', server['server_name'].lower(), '.json'])
 
        with open(filename, 'w') as fb:
 

	
 
        with open(filename, 'w', encoding='utf-8') as fb:
 
            json.dump(server, fb)
 

	
 
        return server
 
    except Exception as e:
 
        return e
ennstatus/donate/functions.py
Show inline comments
 
import os
 
import os.path
 
import csv
 

	
 

	
 
def load_csv(date):
 

	
 
    filename = '.'.join([date, 'csv'])
 
    path = os.path.join('donations', filename)
 

	
 
    with open(path) as csvfile:
 
    with open(path, encoding='utf-8', newline='') as csvfile:
 
        csvreader = csv.reader(csvfile, delimiter=',')
 

	
 
        for row in csvreader:
 
            yield row
 

	
 

	
 
def get_choices():
 

	
 
    files = os.listdir('donations')
 

	
 
    for file in files:
 
        if not file.startswith('.') \
 
           and file.endswith('.csv'):
 
            yield os.path.splitext(file)[0]
ennstatus/status/functions.py
Show inline comments
 
import os
 
import os.path
 
import json
 

	
 
from collections import defaultdict
 
from datetime import datetime
 

	
 
def _load_single_server(name):
 

	
 
    filename = ''.join(['data/', name, '.json'])
 
    try:
 
        with open(filename) as f:
 
        with open(filename, encoding='utf-8') as f:
 
            return ''.join(f.readlines())
 
    except IOError:
 
        return False
 

	
 

	
 
def _check_server(data):
 

	
 
    date = datetime.strptime(data['last_updated'], '%d-%m-%Y %H:%M:%S')
 
    now = datetime.utcnow()
 
    delta = now - date
 

	
 
    if delta.seconds >= 3600:
 
        status = 'Offline'
 
    elif delta.seconds >= 1200:
 
        status = 'Unknown'
 
    else:
 
        status = None
 

	
 
    if status is not None:
 
        for key in ('server_status', 'tor_status'):
 
            data[key] = status
 

	
 
    filename = os.path.join('data', data['server_name'].lower()+'.json')
 

	
 
@@ -45,49 +45,49 @@ def single_server(name):
 
    server = _load_single_server(name)
 

	
 
    if server:
 
        try:
 
            server = json.loads(server)
 
            server = _check_server(server)
 
            return server
 
        except ValueError:
 
            return False
 
    else:
 
        return False
 

	
 

	
 
def _get_json_files(root, files):
 

	
 
    for f in files:
 
        if f.endswith('.json'):
 
            yield os.path.join(root, f)
 

	
 

	
 
def all_servers():
 

	
 
    for root, _, files in os.walk('data'):
 
        for f in _get_json_files(root, files):
 
            with open(f) as fb:
 
            with open(f, encoding='utf-8') as fb:
 
                try:
 
                    server = json.load(fb)
 
                except ValueError:
 
                    fb.close()
 
                    continue
 
            server = _check_server(server)
 
            yield server
 

	
 

	
 
def all_servers_by_type(type):
 

	
 
    for server in all_servers():
 
        if server['server_type'] == type:
 
            yield server
 

	
 

	
 
def split_all_servers_to_types():
 

	
 
    servers = defaultdict(list)
 

	
 
    for server in all_servers():
 
        servers[server['server_type']].append(server)
 

	
 
    return servers
0 comments (0 inline, 0 general)