Skip to content

[8.0] Make TimeUtilities Module independent of timezone #6144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fstagni merged 3 commits into from
Jun 16, 2022
Merged

[8.0] Make TimeUtilities Module independent of timezone #6144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4eaeb0
fix: timezone dependency of TimeUtilities Module
rupozzi Jun 7, 2022
1194a40
fix: Updating client test to UTC time
rupozzi Jun 15, 2022
0aa797c
fix: removing nativetime for time import
rupozzi Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/DIRAC/Core/Utilities/TimeUtilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
if a give datetime is in the defined interval.

"""
import time as nativetime
import calendar
import time
import datetime
import sys

Expand All @@ -38,11 +39,11 @@ def timeThis(method):

def timed(*args, **kw):
"""What actually times"""
ts = nativetime.time()
ts = time.time()
result = method(*args, **kw)
if sys.stdout.isatty():
return result
te = nativetime.time()
te = time.time()

pre = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC ")

Expand Down Expand Up @@ -84,7 +85,7 @@ def toEpoch(dateTimeObject=None):
"""
if not dateTimeObject:
dateTimeObject = datetime.datetime.utcnow()
return nativetime.mktime(dateTimeObject.timetuple())
return calendar.timegm(dateTimeObject.utctimetuple())


def toEpochMilliSeconds(dateTimeObject=None):
Expand All @@ -98,7 +99,7 @@ def fromEpoch(epoch):
"""
Get datetime object from epoch
"""
return datetime.datetime.utcnow().fromtimestamp(epoch)
return datetime.datetime.utcfromtimestamp(epoch)


def toString(myDate=None):
Expand Down Expand Up @@ -235,10 +236,10 @@ def queryTime(f):
"""Decorator to measure the function call time"""

def measureQueryTime(*args, **kwargs):
start = nativetime.time()
start = time.time()
result = f(*args, **kwargs)
if result["OK"] and "QueryTime" not in result:
result["QueryTime"] = nativetime.time() - start
result["QueryTime"] = time.time() - start
return result

return measureQueryTime
4 changes: 2 additions & 2 deletions tests/Integration/Monitoring/Test_MonitoringSystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ def test_getReport(putAndDelete):
params = (
"WMSHistory",
"NumberOfJobs",
datetime(2016, 3, 16, 12, 30, 0, 0),
datetime(2016, 3, 17, 19, 29, 0, 0),
datetime(2016, 3, 16, 10, 30, 0, 0),
datetime(2016, 3, 17, 17, 29, 0, 0),
{"grouping": ["Site"]},
"Site",
{},
Expand Down