From 35e78b3ab7eb5110b2383d340246759793826b3d Mon Sep 17 00:00:00 2001
From: Romain Broucquart <romain.broucquart@synchrotron-soleil.fr>
Date: Fri, 22 Apr 2022 18:55:28 +0200
Subject: [PATCH] Fix the default datestop
* It always gave the now-time at the moment of import...
* By letting the argument to None, it default to now
---
core/ArchiveExtractor.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/core/ArchiveExtractor.py b/core/ArchiveExtractor.py
index 8ba4086..5fe1a52 100755
--- a/core/ArchiveExtractor.py
+++ b/core/ArchiveExtractor.py
@@ -134,7 +134,7 @@ class ArchiveExtractor:
self,
attribute,
dateStart,
- dateStop=datetime.datetime.now(),
+ dateStop=None,
):
"""
Query attribute data from an archiver database, get all points between dates.
@@ -148,9 +148,11 @@ class ArchiveExtractor:
dateStart : datetime.datetime, string
Start date for extraction. If string, it will be parsed.
- dateStop : datetime.datetime, string
- Stop date for extraction. If string, it will be parsed.
- Default is now (datetime.datetime.now())
+ dateStop : datetime.datetime, string, None
+ Stop date for extraction.
+ If string, it will be parsed.
+ If None, it takes the current date and time.
+ Default is None (now).
Exceptions
----------
@@ -170,6 +172,8 @@ class ArchiveExtractor:
# Parse date if it is string
if type(dateStart) is str:
dateStart = self.dateparse(dateStart)
+ if dateStop is None:
+ dateStop = datetime.datetime.now()
if type(dateStop) is str:
dateStop = self.dateparse(dateStop)
--
GitLab