Commit 9631af9e authored by Panmax's avatar Panmax Committed by GitHub

修复 python2 alert 不能传 unicode 的bug

同时修复 not 逻辑
parent da56ec3f
import re import re
import sys
# Valid autobadge values: auto, +N, -N # Valid autobadge values: auto, +N, -N
VALID_AUTOBADGE = re.compile(r'^(auto|[+-][\d]+)$') VALID_AUTOBADGE = re.compile(r'^(auto|[+-][\d]+)$')
PY2 = sys.version_info[0] == 2
if not PY2:
string_types = (str,)
else:
string_types = (str, unicode)
def notification(alert=None, ios=None, android=None, winphone=None): def notification(alert=None, ios=None, android=None, winphone=None):
"""Create a notification payload. """Create a notification payload.
...@@ -47,7 +56,7 @@ def ios(alert=None, badge=None, sound=None, content_available=False, ...@@ -47,7 +56,7 @@ def ios(alert=None, badge=None, sound=None, content_available=False,
""" """
payload = {} payload = {}
if alert is not None: if alert is not None:
if not isinstance(alert, str) or isinstance(alert, dict): if not (isinstance(alert, string_types) or isinstance(alert, dict)):
raise ValueError("iOS alert must be a string or dictionary") raise ValueError("iOS alert must be a string or dictionary")
payload['alert'] = alert payload['alert'] = alert
if badge is not None: if badge is not None:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment