@@ -173,56 +173,56 @@ def test_replace_param_timestamp_with_type_inference_forcing_str():
173173
174174def test_replace_param_datetime ():
175175 param = replace_param ('[DATETIME]' )
176- assert datetime .datetime .strptime (param , '%Y-%m-%d %H:%M:%S.%f' )
176+ assert datetime .datetime .strptime (param , '%Y-%m-%d %H:%M:%S.%f+00:00 ' )
177177
178178
179179def test_replace_param_datetime_language_ignored ():
180180 param = replace_param ('[DATETIME]' , language = 'es' )
181- assert datetime .datetime .strptime (param , '%Y-%m-%d %H:%M:%S.%f' )
181+ assert datetime .datetime .strptime (param , '%Y-%m-%d %H:%M:%S.%f+00:00 ' )
182182
183183
184184def test_replace_param_today_spanish ():
185185 param = replace_param ('[TODAY]' , language = 'es' )
186- assert param == datetime .datetime .utcnow ( ).strftime ('%d/%m/%Y' )
186+ assert param == datetime .datetime .now ( datetime . timezone . utc ).strftime ('%d/%m/%Y' )
187187
188188
189189def test_replace_param_today_not_spanish ():
190190 param = replace_param ('[TODAY]' , language = 'en' )
191- assert param == datetime .datetime .utcnow ( ).strftime ('%Y/%m/%d' )
191+ assert param == datetime .datetime .now ( datetime . timezone . utc ).strftime ('%Y/%m/%d' )
192192
193193
194194def test_replace_param_today_offset ():
195195 param = replace_param ('[TODAY - 1 DAYS]' , language = 'es' )
196196 assert param == datetime .datetime .strftime (
197- datetime .datetime .utcnow ( ) - datetime .timedelta (days = 1 ), '%d/%m/%Y' )
197+ datetime .datetime .now ( datetime . timezone . utc ) - datetime .timedelta (days = 1 ), '%d/%m/%Y' )
198198
199199
200200def test_replace_param_now_spanish ():
201201 param = replace_param ('[NOW]' , language = 'es' )
202- assert param == datetime .datetime .utcnow ( ).strftime ('%d/%m/%Y %H:%M:%S' )
202+ assert param == datetime .datetime .now ( datetime . timezone . utc ).strftime ('%d/%m/%Y %H:%M:%S' )
203203
204204
205205def test_replace_param_now_not_spanish ():
206206 param = replace_param ('[NOW]' , language = 'it' )
207- assert param == datetime .datetime .utcnow ( ).strftime ('%Y/%m/%d %H:%M:%S' )
207+ assert param == datetime .datetime .now ( datetime . timezone . utc ).strftime ('%Y/%m/%d %H:%M:%S' )
208208
209209
210210def test_replace_param_now_with_format ():
211211 param = replace_param ('[NOW(%Y-%m-%dT%H:%M:%SZ)]' )
212- assert param == datetime .datetime .utcnow ( ).strftime ('%Y-%m-%dT%H:%M:%SZ' )
212+ assert param == datetime .datetime .now ( datetime . timezone . utc ).strftime ('%Y-%m-%dT%H:%M:%SZ' )
213213
214214
215215def test_replace_param_now_with_format_and_decimals_limit ():
216216 param = replace_param ('[NOW(%Y-%m-%dT%H:%M:%S.%3fZ)]' )
217217 param_till_dot = param [:param .find ('.' )]
218- assert param_till_dot == datetime .datetime .utcnow ( ).strftime ('%Y-%m-%dT%H:%M:%S' )
218+ assert param_till_dot == datetime .datetime .now ( datetime . timezone . utc ).strftime ('%Y-%m-%dT%H:%M:%S' )
219219 assert re .match (param_till_dot + r'\.\d{3}Z' , param )
220220
221221
222222def test_replace_param_now_with_format_and_decimals_limit_beyond_microseconds ():
223223 param = replace_param ('[NOW(%Y-%m-%dT%H:%M:%S.%12fZ)]' )
224224 param_till_dot = param [:param .find ('.' )]
225- assert param_till_dot == datetime .datetime .utcnow ( ).strftime ('%Y-%m-%dT%H:%M:%S' )
225+ assert param_till_dot == datetime .datetime .now ( datetime . timezone . utc ).strftime ('%Y-%m-%dT%H:%M:%S' )
226226 assert re .match (param_till_dot + r'\.\d{12}Z' , param )
227227
228228
@@ -239,92 +239,92 @@ def test_not_replace_param_now_with_invalid_closing_parenthesis_in_format():
239239def test_replace_param_now_offset ():
240240 param = replace_param ('[NOW + 5 MINUTES]' , language = 'es' )
241241 assert param == datetime .datetime .strftime (
242- datetime .datetime .utcnow ( ) + datetime .timedelta (minutes = 5 ), '%d/%m/%Y %H:%M:%S' )
242+ datetime .datetime .now ( datetime . timezone . utc ) + datetime .timedelta (minutes = 5 ), '%d/%m/%Y %H:%M:%S' )
243243
244244
245245def test_replace_param_now_offset_with_format ():
246246 param = replace_param ('[NOW(%Y-%m-%dT%H:%M:%SZ) + 5 MINUTES]' )
247247 assert param == datetime .datetime .strftime (
248- datetime .datetime .utcnow ( ) + datetime .timedelta (minutes = 5 ), '%Y-%m-%dT%H:%M:%SZ' )
248+ datetime .datetime .now ( datetime . timezone . utc ) + datetime .timedelta (minutes = 5 ), '%Y-%m-%dT%H:%M:%SZ' )
249249
250250
251251def test_replace_param_today_offset_and_more ():
252252 param = replace_param ('The day [TODAY - 1 DAYS] was yesterday' , language = 'es' )
253253 offset_date = datetime .datetime .strftime (
254- datetime .datetime .utcnow ( ) - datetime .timedelta (days = 1 ), '%d/%m/%Y' )
254+ datetime .datetime .now ( datetime . timezone . utc ) - datetime .timedelta (days = 1 ), '%d/%m/%Y' )
255255 assert param == f'The day { offset_date } was yesterday'
256256
257257
258258def test_replace_param_today_offset_and_more_not_spanish ():
259259 param = replace_param ('The day [TODAY - 1 DAYS] was yesterday' , language = 'it' )
260260 offset_date = datetime .datetime .strftime (
261- datetime .datetime .utcnow ( ) - datetime .timedelta (days = 1 ), '%Y/%m/%d' )
261+ datetime .datetime .now ( datetime . timezone . utc ) - datetime .timedelta (days = 1 ), '%Y/%m/%d' )
262262 assert param == f'The day { offset_date } was yesterday'
263263
264264
265265def test_replace_param_now_offset_and_more ():
266266 param = replace_param ('I will arrive at [NOW + 10 MINUTES] tomorrow' , language = 'es' )
267267 offset_datetime = datetime .datetime .strftime (
268- datetime .datetime .utcnow ( ) + datetime .timedelta (minutes = 10 ), '%d/%m/%Y %H:%M:%S' )
268+ datetime .datetime .now ( datetime . timezone . utc ) + datetime .timedelta (minutes = 10 ), '%d/%m/%Y %H:%M:%S' )
269269 assert param == f'I will arrive at { offset_datetime } tomorrow'
270270
271271
272272def test_replace_param_now_offset_and_more_not_spanish ():
273273 param = replace_param ('I will arrive at [NOW + 10 MINUTES] tomorrow' , language = 'it' )
274274 offset_datetime = datetime .datetime .strftime (
275- datetime .datetime .utcnow ( ) + datetime .timedelta (minutes = 10 ), '%Y/%m/%d %H:%M:%S' )
275+ datetime .datetime .now ( datetime . timezone . utc ) + datetime .timedelta (minutes = 10 ), '%Y/%m/%d %H:%M:%S' )
276276 assert param == f'I will arrive at { offset_datetime } tomorrow'
277277
278278
279279def test_replace_param_now_offset_with_format_and_more ():
280280 param = replace_param ('I will arrive at [NOW(%Y-%m-%dT%H:%M:%SZ) + 10 MINUTES] tomorrow' )
281281 offset_datetime = datetime .datetime .strftime (
282- datetime .datetime .utcnow ( ) + datetime .timedelta (minutes = 10 ), '%Y-%m-%dT%H:%M:%SZ' )
282+ datetime .datetime .now ( datetime . timezone . utc ) + datetime .timedelta (minutes = 10 ), '%Y-%m-%dT%H:%M:%SZ' )
283283 assert param == f'I will arrive at { offset_datetime } tomorrow'
284284
285285
286286def test_replace_param_now_offset_with_format_and_more_language_is_irrelevant ():
287287 param = replace_param ('I will arrive at [NOW(%Y-%m-%dT%H:%M:%SZ) + 10 MINUTES] tomorrow' , language = 'ru' )
288288 offset_datetime = datetime .datetime .strftime (
289- datetime .datetime .utcnow ( ) + datetime .timedelta (minutes = 10 ), '%Y-%m-%dT%H:%M:%SZ' )
289+ datetime .datetime .now ( datetime . timezone . utc ) + datetime .timedelta (minutes = 10 ), '%Y-%m-%dT%H:%M:%SZ' )
290290 assert param == f'I will arrive at { offset_datetime } tomorrow'
291291
292292
293293def test_replace_param_today_offset_with_format_and_more_with_extra_spaces ():
294294 param = replace_param ('The date [NOW(%Y-%m-%dT%H:%M:%SZ) - 1 DAYS ] was yesterday' )
295295 offset_date = datetime .datetime .strftime (
296- datetime .datetime .utcnow ( ) - datetime .timedelta (days = 1 ), '%Y-%m-%dT%H:%M:%SZ' )
296+ datetime .datetime .now ( datetime . timezone . utc ) - datetime .timedelta (days = 1 ), '%Y-%m-%dT%H:%M:%SZ' )
297297 assert param == f'The date { offset_date } was yesterday'
298298
299299
300300def test_replace_param_today_offset_and_more_with_extra_spaces ():
301301 param = replace_param ('The day [TODAY - 1 DAYS ] was yesterday' , language = 'es' )
302302 offset_date = datetime .datetime .strftime (
303- datetime .datetime .utcnow ( ) - datetime .timedelta (days = 1 ), '%d/%m/%Y' )
303+ datetime .datetime .now ( datetime . timezone . utc ) - datetime .timedelta (days = 1 ), '%d/%m/%Y' )
304304 assert param == f'The day { offset_date } was yesterday'
305305
306306
307307def test_replace_param_today_offset_and_more_at_the_end ():
308308 param = replace_param ('Yesterday was [TODAY - 1 DAYS]' , language = 'es' )
309309 offset_date = datetime .datetime .strftime (
310- datetime .datetime .utcnow ( ) - datetime .timedelta (days = 1 ), '%d/%m/%Y' )
310+ datetime .datetime .now ( datetime . timezone . utc ) - datetime .timedelta (days = 1 ), '%d/%m/%Y' )
311311 assert param == f'Yesterday was { offset_date } '
312312
313313
314314def test_replace_param_today_offset_and_more_at_the_beginning ():
315315 param = replace_param ('[TODAY - 1 DAYS] is yesterday' , language = 'es' )
316316 offset_date = datetime .datetime .strftime (
317- datetime .datetime .utcnow ( ) - datetime .timedelta (days = 1 ), '%d/%m/%Y' )
317+ datetime .datetime .now ( datetime . timezone . utc ) - datetime .timedelta (days = 1 ), '%d/%m/%Y' )
318318 assert param == f'{ offset_date } is yesterday'
319319
320320
321321def test_replace_param_today_offsets_and_more ():
322322 param = replace_param (
323323 'The day [TODAY - 1 DAYS] was yesterday and I have an appointment at [NOW + 10 MINUTES]' , language = 'es' )
324324 offset_date = datetime .datetime .strftime (
325- datetime .datetime .utcnow ( ) - datetime .timedelta (days = 1 ), '%d/%m/%Y' )
325+ datetime .datetime .now ( datetime . timezone . utc ) - datetime .timedelta (days = 1 ), '%d/%m/%Y' )
326326 offset_datetime = datetime .datetime .strftime (
327- datetime .datetime .utcnow ( ) + datetime .timedelta (minutes = 10 ), '%d/%m/%Y %H:%M:%S' )
327+ datetime .datetime .now ( datetime . timezone . utc ) + datetime .timedelta (minutes = 10 ), '%d/%m/%Y %H:%M:%S' )
328328 assert param == f'The day { offset_date } was yesterday and I have an appointment at { offset_datetime } '
329329
330330
@@ -333,9 +333,9 @@ def test_replace_param_now_offsets_with_format_and_more():
333333 'The date [NOW(%Y-%m-%dT%H:%M:%SZ) - 1 DAYS] was yesterday '
334334 'and I have an appointment at [NOW(%Y-%m-%dT%H:%M:%SZ) + 10 MINUTES]' )
335335 offset_date = datetime .datetime .strftime (
336- datetime .datetime .utcnow ( ) - datetime .timedelta (days = 1 ), '%Y-%m-%dT%H:%M:%SZ' )
336+ datetime .datetime .now ( datetime . timezone . utc ) - datetime .timedelta (days = 1 ), '%Y-%m-%dT%H:%M:%SZ' )
337337 offset_datetime = datetime .datetime .strftime (
338- datetime .datetime .utcnow ( ) + datetime .timedelta (minutes = 10 ), '%Y-%m-%dT%H:%M:%SZ' )
338+ datetime .datetime .now ( datetime . timezone . utc ) + datetime .timedelta (minutes = 10 ), '%Y-%m-%dT%H:%M:%SZ' )
339339 assert param == f'The date { offset_date } was yesterday and I have an appointment at { offset_datetime } '
340340
341341
@@ -344,9 +344,9 @@ def test_replace_param_now_offsets_with_and_without_format_and_more():
344344 'The date [NOW(%Y-%m-%dT%H:%M:%SZ) - 1 DAYS] was yesterday '
345345 'and I have an appointment at [NOW + 10 MINUTES]' , language = 'es' )
346346 offset_date = datetime .datetime .strftime (
347- datetime .datetime .utcnow ( ) - datetime .timedelta (days = 1 ), '%Y-%m-%dT%H:%M:%SZ' )
347+ datetime .datetime .now ( datetime . timezone . utc ) - datetime .timedelta (days = 1 ), '%Y-%m-%dT%H:%M:%SZ' )
348348 offset_datetime = datetime .datetime .strftime (
349- datetime .datetime .utcnow ( ) + datetime .timedelta (minutes = 10 ), '%d/%m/%Y %H:%M:%S' )
349+ datetime .datetime .now ( datetime . timezone . utc ) + datetime .timedelta (minutes = 10 ), '%d/%m/%Y %H:%M:%S' )
350350 assert param == f'The date { offset_date } was yesterday and I have an appointment at { offset_datetime } '
351351
352352
0 commit comments