fix(push): expiration time encoding

Previously, the expiration time parameter of push `send` function
was mistakenly encoded (e.g. `2016-01-28T00:07:29.773363+00:00`),
not encoded as expected (e.g. `2016-01-28T00:07:29.773Z`).
This commit fix this encoding issue.

Author: weakish

leancloud/push.py

@@ -31,6 +31,13 @@ def save(self, *args, **kwargs):
         raise LeanCloudError(code=1, error='Notification does not support modify')
 
 
+def _encode_time(time):
+    tzinfo = time.tzinfo
+    if tzinfo is None:
+        tzinfo = tz.tzlocal()
+    return arrow.get(time, tzinfo).to('utc').format('YYYY-MM-DDTHH:mm:ss.SSS') + 'Z'
+
+
 def send(data, channels=None, push_time=None, expiration_time=None, expiration_interval=None, where=None, cql=None):
     """
     发送推送消息。返回结果为此条推送对应的 _Notification 表中的对象，但是如果需要使用其中的数据，需要调用 fetch() 方法将数据同步至本地。
@@ -63,12 +70,9 @@ def send(data, channels=None, push_time=None, expiration_time=None, expiration_i
     if channels:
         params['channels'] = channels
     if push_time:
-        tzinfo = push_time.tzinfo
-        if tzinfo is None:
-            tzinfo = tz.tzlocal()
-        params['push_time'] = arrow.get(push_time, tzinfo).to('utc').format('YYYY-MM-DDTHH:mm:ss.SSS') + 'Z'
+        params['push_time'] = _encode_time(push_time)
     if expiration_time:
-        params['expiration_time'] = expiration_time.isoformat()
+        params['expiration_time'] = _encode_time(expiration_time)
     if expiration_interval:
         params['expiration_interval'] = expiration_interval
     if where:

tests/test_push.py

@@ -6,7 +6,7 @@
 
 import os
 import time
-from datetime import datetime
+from datetime import datetime, timedelta
 
 from nose.tools import with_setup  # type: ignore
 
@@ -42,7 +42,9 @@ def test_basic_push():  # type: () -> None
         }
     }
     query = leancloud.Query('_Installation').equal_to('objectId', 'xxx')
-    notification = push.send(data, where=query, push_time=datetime.now())
+    now = datetime.now()
+    two_hours_later = now + timedelta(hours=2)
+    notification = push.send(data, where=query, push_time=now, expiration_time=two_hours_later)
     time.sleep(5)  # notification write may have delay
     notification.fetch()
     assert(notification.id)