Commit d9454aaf authored by fendouai's avatar fendouai

fix format

parent 066e02d6
......@@ -12,12 +12,13 @@ from .schedule import Schedule
logger = logging.getLogger('jpush')
logging.basicConfig(level = logging.DEBUG,
logging.basicConfig(level=logging.DEBUG,
format = '%(asctime)s %(filename)s[line:%(lineno)d] %(levelname)s %(message)s',
datefmt = '%a, %d %b %Y %H:%M:%S',
filename = 'jpush.log',
filemode = 'w')
class JPush(object):
def __init__(self, key, secret):
self.key = key
......
......@@ -53,11 +53,13 @@ def device_tag(*types):
tag["tags"][key] = t[key]
return tag
def device_mobile(device_mobile):
mobile={}
mobile["mobile"]=device_mobile
return mobile
def device_alias(*types):
"""Get an alias object
......@@ -80,6 +82,7 @@ def device_alias(*types):
alias["alias"][key] = t[key]
return alias
def device_regid(*types):
"""Get a registration_id object
......
......@@ -5,6 +5,7 @@ from jpush import common
logger = logging.getLogger('jpush')
class Report(object):
"""JPush Report API V3"""
def __init__(self, jpush):
......@@ -25,7 +26,6 @@ class Report(object):
print (received)
return received
def get_messages(self, msg_ids):
url = common.MESSAGES_URL + msg_ids
body = None
......@@ -41,6 +41,7 @@ class Report(object):
print (users)
return users
class ReportResponse(object):
"""Response to a successful device request send.
......
......@@ -13,14 +13,14 @@ class Schedule(object):
response = self._jpush._request(method, body, url, content_type, version=3)
return ScheduleResponse(response)
def post_schedule(self,schedulepayload):
def post_schedule(self, schedulepayload):
url=common.BASE_SCHEDULEURL
body = json.dumps(schedulepayload)
result = self.send("POST", url, body)
print (result)
return result
def get_schedule_by_id(self,schedule_id):
def get_schedule_by_id(self, schedule_id):
url=common.BASE_SCHEDULEURL + schedule_id
print url
body = None
......@@ -28,7 +28,7 @@ class Schedule(object):
print (result)
return result
def get_schedule_list(self,page_id):
def get_schedule_list(self, page_id):
if page_id is not None:
url=common.BASE_LISTURL + page_id
else:
......@@ -39,8 +39,7 @@ class Schedule(object):
print (result)
return result
def put_schedule(self, schedulepayload,schedule_id):
def put_schedule(self, schedulepayload, schedule_id):
url = common.BASE_SCHEDULEURL + schedule_id
body = json.dumps(schedulepayload)
result = self.send("PUT", url, body)
......@@ -55,6 +54,7 @@ class Schedule(object):
print (result)
return result
class ScheduleResponse(object):
"""Response to a successful device request send.
......
......@@ -11,11 +11,11 @@ def schedulepayload(name=None, enabled=None, trigger=None, push=None):
if push is not None:
schedulepayload['push'] = push
if not schedulepayload:
raise ValueError("schedulepayload may not be empty")
raise ValueError("schedule payload may not be empty")
return schedulepayload
def trigger(time,start=None, end=None,time_unit=None,frequency=None,point=None):
def trigger(time, start=None, end=None,time_unit=None,frequency=None,point=None):
if(start==None and end==None and time_unit==None and frequency==None):
trigger={}
single={}
......
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