From cafd0dd884d9a10ea761efdef7bb1a1938082092 Mon Sep 17 00:00:00 2001
From: ljf <ljf+git@grimaud.me>
Date: Sun, 9 Dec 2018 23:55:51 +0100
Subject: [PATCH] [enh] Remove pytz

---
 debian/control      | 2 +-
 src/yunohost/log.py | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index f0423c4a3..9f72bf11a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Package: yunohost
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
  , 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
  , glances
  , dnsutils, bind9utils, unzip, git, curl, cron, wget, jq
diff --git a/src/yunohost/log.py b/src/yunohost/log.py
index af19090c8..f11c587d1 100644
--- a/src/yunohost/log.py
+++ b/src/yunohost/log.py
@@ -28,7 +28,6 @@ import os
 import yaml
 import errno
 import collections
-import pytz
 
 from datetime import datetime
 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'] = 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']:
-                    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:
                     log_path = metadata['log_path']
             except yaml.YAMLError:
@@ -321,7 +320,7 @@ class OperationLogger(object):
         """
 
         if self.started_at is None:
-            self.started_at = datetime.now(tz=pytz.utc)
+            self.started_at = datetime.utcnow()
             self.flush()
             self._register_log()
 
@@ -413,7 +412,7 @@ class OperationLogger(object):
             return
         if error is not None and not isinstance(error, basestring):
             error = str(error)
-        self.ended_at = datetime.now(tz=pytz.utc)
+        self.ended_at = datetime.utcnow()
         self._error = error
         self._success = error is None
         if self.logger is not None: