master
nathaniel smith 2015-07-31 22:03:02 -07:00
parent e312887f45
commit d565696117
2 changed files with 3 additions and 2 deletions

View File

@ -73,7 +73,7 @@ def get_data():
data = {'generated_at': datetime.now().strftime('%Y-%m-%d %H:%M:%S'), data = {'generated_at': datetime.now().strftime('%Y-%m-%d %H:%M:%S'),
'site_name': 'tilde.town', 'site_name': 'tilde.town',
'site_url': 'http://tilde.town', 'site_url': 'http://tilde.town',
'uptime': str(uptime('-p')),} 'uptime': str(uptime('-p')).rstrip(),}
data.update(user_data) data.update(user_data)
return data return data

View File

@ -6,6 +6,7 @@ def slurp(file_path):
except FileNotFoundError: except FileNotFoundError:
pass pass
except UnicodeDecodeError: except UnicodeDecodeError:
pass
return contents return contents
def thread(initial, *fns): def thread(initial, *fns):