Changeset - b491f9fa59bd
Parent rev.
Child rev.
[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:
ennstatus/api/functions.py
2
1
ennstatus/donate/functions.py
1
1
ennstatus/status/functions.py
2
2
0 comments (0 inline, 0 general)
ennstatus/api/functions.py
➞
Show inline comments
 
@@ -78,18 +78,19 @@ def update_server(server, ip):
 
        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('.') \

			




        

    


    
    

    

        

                

                    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:

			




	
	
		
 
@@ -57,25 +57,25 @@ def single_server(name):

			




	
	
	
		
 

			




	
	
	
		
 
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():

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: saturn-1552607
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support