From dcbafa32d194d65c7fea6a5879ffb163f6d0c80d Mon Sep 17 00:00:00 2001 From: Don Cross Date: Thu, 30 May 2024 21:46:06 -0400 Subject: [PATCH] PY: replace deprecated function datetime.utcnow(). --- demo/python/astronomy.py | 4 ++-- generate/template/astronomy.py | 4 ++-- generate/test.py | 2 +- source/python/astronomy/astronomy.py | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/demo/python/astronomy.py b/demo/python/astronomy.py index afaca19a..15ab13b7 100644 --- a/demo/python/astronomy.py +++ b/demo/python/astronomy.py @@ -76,7 +76,7 @@ _RAD2HOUR = 3.819718634205488 # 12/pi = factor to convert radians to s _HOUR2RAD = 0.2617993877991494365 # pi/12 = factor to convert sidereal hours to radians _DAYS_PER_TROPICAL_YEAR = 365.24217 _PI2 = 2.0 * math.pi -_EPOCH = datetime.datetime(2000, 1, 1, 12) +_EPOCH = datetime.datetime(2000, 1, 1, 12, tzinfo = datetime.timezone.utc) _ASEC360 = 1296000.0 _ASEC2RAD = 4.848136811095359935899141e-6 _ARC = 3600.0 * 180.0 / math.pi # arcseconds per radian @@ -449,7 +449,7 @@ class Time: ------- Time """ - ut = (datetime.datetime.utcnow() - _EPOCH).total_seconds() / 86400.0 + ut = (datetime.datetime.now(datetime.timezone.utc) - _EPOCH).total_seconds() / 86400.0 return Time(ut) def AddDays(self, days: float) -> "Time": diff --git a/generate/template/astronomy.py b/generate/template/astronomy.py index 5d995118..ac3526e2 100644 --- a/generate/template/astronomy.py +++ b/generate/template/astronomy.py @@ -76,7 +76,7 @@ _RAD2HOUR = 3.819718634205488 # 12/pi = factor to convert radians to s _HOUR2RAD = 0.2617993877991494365 # pi/12 = factor to convert sidereal hours to radians _DAYS_PER_TROPICAL_YEAR = 365.24217 _PI2 = 2.0 * math.pi -_EPOCH = datetime.datetime(2000, 1, 1, 12) +_EPOCH = datetime.datetime(2000, 1, 1, 12, tzinfo = datetime.timezone.utc) _ASEC360 = 1296000.0 _ASEC2RAD = 4.848136811095359935899141e-6 _ARC = 3600.0 * 180.0 / math.pi # arcseconds per radian @@ -449,7 +449,7 @@ class Time: ------- Time """ - ut = (datetime.datetime.utcnow() - _EPOCH).total_seconds() / 86400.0 + ut = (datetime.datetime.now(datetime.timezone.utc) - _EPOCH).total_seconds() / 86400.0 return Time(ut) def AddDays(self, days: float) -> "Time": diff --git a/generate/test.py b/generate/test.py index 23d7846f..b27ff6ea 100755 --- a/generate/test.py +++ b/generate/test.py @@ -94,7 +94,7 @@ def AstroTime(): print('PY AstroTime: excessive TT error {}'.format(diff)) return 1 s = str(time.Utc()) - if s != '2018-12-02 18:30:12.543000': + if s != '2018-12-02 18:30:12.543000+00:00': print('PY AstroTime: Utc() returned incorrect string "{}"'.format(s)) return 1 time = astronomy.Time.Make(2018, 12, 31, 23, 59, 59.9999) diff --git a/source/python/astronomy/astronomy.py b/source/python/astronomy/astronomy.py index afaca19a..15ab13b7 100644 --- a/source/python/astronomy/astronomy.py +++ b/source/python/astronomy/astronomy.py @@ -76,7 +76,7 @@ _RAD2HOUR = 3.819718634205488 # 12/pi = factor to convert radians to s _HOUR2RAD = 0.2617993877991494365 # pi/12 = factor to convert sidereal hours to radians _DAYS_PER_TROPICAL_YEAR = 365.24217 _PI2 = 2.0 * math.pi -_EPOCH = datetime.datetime(2000, 1, 1, 12) +_EPOCH = datetime.datetime(2000, 1, 1, 12, tzinfo = datetime.timezone.utc) _ASEC360 = 1296000.0 _ASEC2RAD = 4.848136811095359935899141e-6 _ARC = 3600.0 * 180.0 / math.pi # arcseconds per radian @@ -449,7 +449,7 @@ class Time: ------- Time """ - ut = (datetime.datetime.utcnow() - _EPOCH).total_seconds() / 86400.0 + ut = (datetime.datetime.now(datetime.timezone.utc) - _EPOCH).total_seconds() / 86400.0 return Time(ut) def AddDays(self, days: float) -> "Time":