Skip to content

Commit 8fe012a

Browse files
miguelgrinbergmiguelgrinberg
committed
Stop using deprecated datetime functions
1 parent b75fd31 commit 8fe012a

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎src/socketio/admin.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from datetime import datetime
1+
from datetime import datetime, timezone
22
import functools
33
import os
44
import socket
@@ -204,7 +204,7 @@ def _trigger_event(self, event, namespace, *args):
204204
serialized_socket = self.serialize_socket(sid, namespace, eio_sid)
205205
self.sio.emit('socket_connected', (
206206
serialized_socket,
207-
datetime.utcfromtimestamp(t).isoformat() + 'Z',
207+
datetime.fromtimestamp(t, timezone.utc).isoformat(),
208208
), namespace=self.admin_namespace)
209209
elif event == 'disconnect':
210210
del self.sio.manager._timestamps[sid]
@@ -213,14 +213,14 @@ def _trigger_event(self, event, namespace, *args):
213213
namespace,
214214
sid,
215215
reason,
216-
datetime.utcfromtimestamp(t).isoformat() + 'Z',
216+
datetime.fromtimestamp(t, timezone.utc).isoformat(),
217217
), namespace=self.admin_namespace)
218218
else:
219219
self.sio.emit('event_received', (
220220
namespace,
221221
sid,
222222
(event, *args[1:]),
223-
datetime.utcfromtimestamp(t).isoformat() + 'Z',
223+
datetime.fromtimestamp(t, timezone.utc).isoformat(),
224224
), namespace=self.admin_namespace)
225225
return self.sio.__trigger_event(event, namespace, *args)
226226

@@ -246,7 +246,7 @@ def _basic_enter_room(self, sid, namespace, room, eio_sid=None):
246246
namespace,
247247
room,
248248
sid,
249-
datetime.utcnow().isoformat() + 'Z',
249+
datetime.now(timezone.utc).isoformat(),
250250
), namespace=self.admin_namespace)
251251
return ret
252252

@@ -256,7 +256,7 @@ def _basic_leave_room(self, sid, namespace, room):
256256
namespace,
257257
room,
258258
sid,
259-
datetime.utcnow().isoformat() + 'Z',
259+
datetime.now(timezone.utc).isoformat(),
260260
), namespace=self.admin_namespace)
261261
return self.sio.manager.__basic_leave_room(sid, namespace, room)
262262

@@ -276,7 +276,7 @@ def _emit(self, event, data, namespace, room=None, skip_sid=None,
276276
namespace,
277277
sid,
278278
event_data,
279-
datetime.utcnow().isoformat() + 'Z',
279+
datetime.now(timezone.utc).isoformat(),
280280
), namespace=self.admin_namespace)
281281
return ret
282282

@@ -335,7 +335,7 @@ def _eio_send_ping(socket, self): # pragma: no cover
335335
eio_sid)
336336
self.sio.emit('socket_connected', (
337337
serialized_socket,
338-
datetime.utcfromtimestamp(t).isoformat() + 'Z',
338+
datetime.fromtimestamp(t, timezone.utc).isoformat(),
339339
), namespace=self.admin_namespace)
340340
return socket.__send_ping()
341341

@@ -384,7 +384,7 @@ def serialize_socket(self, sid, namespace, eio_sid=None):
384384
'secure': environ.get('wsgi.url_scheme', '') == 'https',
385385
'url': environ.get('PATH_INFO', ''),
386386
'issued': tm * 1000,
387-
'time': datetime.utcfromtimestamp(tm).isoformat() + 'Z'
387+
'time': datetime.fromtimestamp(tm, timezone.utc).isoformat()
388388
if tm else '',
389389
},
390390
'rooms': self.sio.manager.get_rooms(sid, namespace),

‎src/socketio/async_admin.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import asyncio
2-
from datetime import datetime
2+
from datetime import datetime, timezone
33
import functools
44
import os
55
import socket
@@ -192,7 +192,7 @@ async def _trigger_event(self, event, namespace, *args):
192192
serialized_socket = self.serialize_socket(sid, namespace, eio_sid)
193193
await self.sio.emit('socket_connected', (
194194
serialized_socket,
195-
datetime.utcfromtimestamp(t).isoformat() + 'Z',
195+
datetime.fromtimestamp(t, timezone.utc).isoformat(),
196196
), namespace=self.admin_namespace)
197197
elif event == 'disconnect':
198198
del self.sio.manager._timestamps[sid]
@@ -201,14 +201,14 @@ async def _trigger_event(self, event, namespace, *args):
201201
namespace,
202202
sid,
203203
reason,
204-
datetime.utcfromtimestamp(t).isoformat() + 'Z',
204+
datetime.fromtimestamp(t, timezone.utc).isoformat(),
205205
), namespace=self.admin_namespace)
206206
else:
207207
await self.sio.emit('event_received', (
208208
namespace,
209209
sid,
210210
(event, *args[1:]),
211-
datetime.utcfromtimestamp(t).isoformat() + 'Z',
211+
datetime.fromtimestamp(t, timezone.utc).isoformat(),
212212
), namespace=self.admin_namespace)
213213
return await self.sio.__trigger_event(event, namespace, *args)
214214

@@ -235,7 +235,7 @@ def _basic_enter_room(self, sid, namespace, room, eio_sid=None):
235235
namespace,
236236
room,
237237
sid,
238-
datetime.utcnow().isoformat() + 'Z',
238+
datetime.now(timezone.utc).isoformat(),
239239
)))
240240
return ret
241241

@@ -245,7 +245,7 @@ def _basic_leave_room(self, sid, namespace, room):
245245
namespace,
246246
room,
247247
sid,
248-
datetime.utcnow().isoformat() + 'Z',
248+
datetime.now(timezone.utc).isoformat(),
249249
)))
250250
return self.sio.manager.__basic_leave_room(sid, namespace, room)
251251

@@ -265,7 +265,7 @@ async def _emit(self, event, data, namespace, room=None, skip_sid=None,
265265
namespace,
266266
sid,
267267
event_data,
268-
datetime.utcnow().isoformat() + 'Z',
268+
datetime.now(timezone.utc).isoformat(),
269269
), namespace=self.admin_namespace)
270270
return ret
271271

@@ -324,7 +324,7 @@ async def _eio_send_ping(socket, self): # pragma: no cover
324324
eio_sid)
325325
await self.sio.emit('socket_connected', (
326326
serialized_socket,
327-
datetime.utcfromtimestamp(t).isoformat() + 'Z',
327+
datetime.fromtimestamp(t, timezone.utc).isoformat(),
328328
), namespace=self.admin_namespace)
329329
return await socket.__send_ping()
330330

@@ -377,7 +377,7 @@ def serialize_socket(self, sid, namespace, eio_sid=None):
377377
'secure': environ.get('wsgi.url_scheme', '') == 'https',
378378
'url': environ.get('PATH_INFO', ''),
379379
'issued': tm * 1000,
380-
'time': datetime.utcfromtimestamp(tm).isoformat() + 'Z'
380+
'time': datetime.fromtimestamp(tm, timezone.utc).isoformat()
381381
if tm else '',
382382
},
383383
'rooms': self.sio.manager.get_rooms(sid, namespace),

0 commit comments

Comments
 (0)