Merge pull request #407 from weakish/push-expiration-time-encoding

push expiration time encoding

Author: weakish

Pipfile

@@ -19,7 +19,8 @@ arrow = "*"
 "iso8601" = "*"
 six = ">=1.11.0"
 qiniu = ">=7.1.4,<7.2.4"
-requests = ">=2.22.0"
+"urllib3" = ">=1.24.3,<1.25.0"
+requests = ">=2.20.0,<2.22.0"
 werkzeug = "*"
 gevent = ">=1.0.2,<2.0.0"
 typing = { version = "*", markers = "python_version < '3.5.0'" }

Pipfile.lock

@@ -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:

leancloud/push.py

@@ -10,7 +10,8 @@
     'iso8601',
     'six>=1.11.0',
     'qiniu>=7.1.4,<7.2.4',
-    'requests>=2.12.1',
+    'requests>=2.20.0,<2.22.0',
+    'urllib3>=1.24.3,<1.25.0'
     'werkzeug',
     'gevent>=1.0.2,<2.0.0'
 ]

setup.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
 
@@ -25,10 +25,10 @@ def setup_func():
 
 @with_setup(setup_func)
 def test_basic_push():  # type: () -> None
-    instanlation = leancloud.Installation()
-    instanlation.set('deviceType', 'ios')
-    instanlation.set('deviceToken', 'xxx')
-    instanlation.save()
+    installation = leancloud.Installation()
+    installation.set('deviceType', 'ios')
+    installation.set('deviceToken', 'xxx')
+    installation.save()
 
     data = {
         "alert": {
@@ -42,10 +42,12 @@ 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)
+    assert notification.id
 
     try:
         notification.save()