afonin/PyAPNs2
1
0
Fork 0
Code Issues Wiki Activity

Make topic parameter optional again

Browse Source
This commit is contained in:
Sergey Petrov
2017-05-14 02:11:43 +03:00
parent e454a79d7f
commit e10319b78d
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apns2/client.py
+8 -4
View File
@@ -48,19 +48,22 @@ class APNsClient(object):
self._connection = self.__credentials.create_connection(server, port, self._connection = self.__credentials.create_connection(server, port,
proto) proto)
def send_notification(self, token_hex, notification, topic, priority=NotificationPriority.Immediate, def send_notification(self, token_hex, notification, topic=None, priority=NotificationPriority.Immediate,
expiration=None, collapse_id=None): expiration=None, collapse_id=None):
stream_id = self.send_notification_async(token_hex, notification, topic, priority, expiration, collapse_id) stream_id = self.send_notification_async(token_hex, notification, topic, priority, expiration, collapse_id)
result = self.get_notification_result(stream_id) result = self.get_notification_result(stream_id)
if result != 'Success': if result != 'Success':
raise exception_class_for_reason(result) raise exception_class_for_reason(result)
def send_notification_async(self, token_hex, notification, topic, priority=NotificationPriority.Immediate, def send_notification_async(self, token_hex, notification, topic=None, priority=NotificationPriority.Immediate,
expiration=None, collapse_id=None): expiration=None, collapse_id=None):
json_str = json.dumps(notification.dict(), cls=self.__json_encoder, ensure_ascii=False, separators=(',', ':')) json_str = json.dumps(notification.dict(), cls=self.__json_encoder, ensure_ascii=False, separators=(',', ':'))
json_payload = json_str.encode('utf-8') json_payload = json_str.encode('utf-8')
headers = {'apns-topic': topic} headers = {}
if topic is not None:
headers['apns-topic'] = topic
if priority != DEFAULT_APNS_PRIORITY: if priority != DEFAULT_APNS_PRIORITY:
headers['apns-priority'] = priority.value headers['apns-priority'] = priority.value
@@ -87,7 +90,8 @@ class APNsClient(object):
data = json.loads(raw_data) data = json.loads(raw_data)
return data['reason'] return data['reason']
def send_notification_batch(self, notifications, topic, priority=NotificationPriority.Immediate, expiration=None, collapse_id=None): def send_notification_batch(self, notifications, topic=None, priority=NotificationPriority.Immediate,
expiration=None, collapse_id=None):
''' '''
Send a notification to a list of tokens in batch. Instead of sending a synchronous request Send a notification to a list of tokens in batch. Instead of sending a synchronous request
for each token, send multiple requests concurrently. This is done on the same connection, for each token, send multiple requests concurrently. This is done on the same connection,