YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] Remove pytz

Browse source
This commit is contained in:
ljf 2018-12-09 23:55:51 +01:00
parent db1b00e706
commit cafd0dd884
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/control vendored
View file

@ -11,7 +11,7 @@ Package: yunohost
Architecture: all Architecture: all
Depends: ${python:Depends}, ${misc:Depends} Depends: ${python:Depends}, ${misc:Depends}
, moulinette (>= 2.7.1), ssowat (>= 2.7.1) , moulinette (>= 2.7.1), ssowat (>= 2.7.1)
, python-psutil, python-requests, python-dnspython, python-openssl, python-tz , python-psutil, python-requests, python-dnspython, python-openssl
, python-apt, python-miniupnpc, python-dbus, python-jinja2 , python-apt, python-miniupnpc, python-dbus, python-jinja2
, glances , glances
, dnsutils, bind9utils, unzip, git, curl, cron, wget, jq , dnsutils, bind9utils, unzip, git, curl, cron, wget, jq

9
src/yunohost/log.py
View file

@ -28,7 +28,6 @@ import os
import yaml import yaml
import errno import errno
import collections import collections
import pytz
from datetime import datetime from datetime import datetime
from logging import FileHandler, getLogger, Formatter from logging import FileHandler, getLogger, Formatter
@ -184,9 +183,9 @@ def log_display(path, number=50, share=False):
infos['metadata_path'] = md_path infos['metadata_path'] = md_path
infos['metadata'] = metadata infos['metadata'] = metadata
if 'started_at' in infos['metadata']: if 'started_at' in infos['metadata']:
infos['metadata']['started_at'] = infos['metadata']['started_at'].replace(tzinfo=pytz.utc) infos['metadata']['started_at'] = infos['metadata']['started_at']
if 'ended_at' in infos['metadata']: if 'ended_at' in infos['metadata']:
infos['metadata']['ended_at'] = infos['metadata']['ended_at'].replace(tzinfo=pytz.utc) infos['metadata']['ended_at'] = infos['metadata']['ended_at']
if 'log_path' in metadata: if 'log_path' in metadata:
log_path = metadata['log_path'] log_path = metadata['log_path']
except yaml.YAMLError: except yaml.YAMLError:
@ -321,7 +320,7 @@ class OperationLogger(object):
""" """
if self.started_at is None: if self.started_at is None:
self.started_at = datetime.now(tz=pytz.utc) self.started_at = datetime.utcnow()
self.flush() self.flush()
self._register_log() self._register_log()
@ -413,7 +412,7 @@ class OperationLogger(object):
return return
if error is not None and not isinstance(error, basestring): if error is not None and not isinstance(error, basestring):
error = str(error) error = str(error)
self.ended_at = datetime.now(tz=pytz.utc) self.ended_at = datetime.utcnow()
self._error = error self._error = error
self._success = error is None self._success = error is None
if self.logger is not None: if self.logger is not None: