format code

Author: Helperhaps

jpush/device/core.py

@@ -12,27 +12,25 @@ def __init__(self, jpush, zone = None):
         self.entity = None
         self.zone = zone or jpush.zone
 
-    def send(self, method, url, body, content_type=None, version=3):
+    def send(self, method, url, body = None, content_type=None, version=3, params = None):
         """Send the request
 
         """
-        response = self._jpush._request(method, body, url, content_type, version=3)
+        response = self._jpush._request(method, body, url, content_type, version=3, params = params)
         return DeviceResponse(response)
 
     def get_taglist(self):
         """Get deviceinfo with registration id.
         """
         url = common.get_url('tag', self.zone)
-        body = None
-        info = self.send("GET", url, body)
+        info = self.send("GET", url)
         return info
 
     def get_deviceinfo(self, registration_id):
         """Get deviceinfo with registration id.
         """
         url = common.get_url('device', self.zone) + registration_id
-        body = None
-        info = self.send("GET", url, body)
+        info = self.send("GET", url)
         return info
 
     def set_deviceinfo(self, registration_id, entity):
@@ -55,10 +53,8 @@ def delete_tag(self, tag, platform=None):
         """Delete registration id tag.
         """
         url = common.get_url('tag', self.zone) + tag
-        body = None
-        if platform:
-            body = platform
-        info = self.send("DELETE", url, body)
+        params = { 'platform': platform } if platform else None
+        info = self.send("DELETE", url, params = params)
         return info
 
     def update_tagusers(self, tag, entity):
@@ -73,28 +69,23 @@ def check_taguserexist(self, tag, registration_id):
         """Check registration id whether in tag.
         """
         url = common.get_url('tag', self.zone) + tag + "/registration_ids/" + registration_id
-        body = registration_id
-        info = self.send("GET", url, body)
+        info = self.send("GET", url)
         return info
 
     def delete_alias(self, alias, platform=None):
         """Delete appkey alias.
         """
         url = common.get_url('alias', self.zone) + alias
-        body = None
-        if platform:
-            body = platform
-        info = self.send("DELETE", url, body)
+        params = { 'platform': platform } if platform else None
+        info = self.send("DELETE", url, params = params)
         return info
 
     def get_aliasuser(self, alias, platform=None):
         """Get appkey alias users.
         """
         url = common.get_url('alias', self.zone) + alias
-        body = None
-        if platform:
-            body = platform
-        info = self.send("GET", url, body)
+        params = { 'platform': platform } if platform else None
+        info = self.send("GET", url, params = params)
         return info
 
 

jpush/report/core.py

@@ -10,7 +10,7 @@ def __init__(self, jpush, zone = None):
         self._jpush = jpush
         self.zone = zone or jpush.zone
 
-    def send(self, method, url, body, content_type=None, version=3, params = None):
+    def send(self, method, url, body = None, content_type=None, version=3, params = None):
         """Send the request
         """
         response = self._jpush._request(method, body,url,content_type,version=3, params = params)
@@ -19,15 +19,13 @@ def send(self, method, url, body, content_type=None, version=3, params = None):
     def get_received(self,msg_ids):
         url = common.get_url('report', self.zone) + 'received'
         params = { 'msg_ids': msg_ids }
-        body = None
-        received = self.send("GET", url, body, params = params)
+        received = self.send("GET", url, params = params)
         return received
 
     def get_messages(self, msg_ids):
         url = common.get_url('report', self.zone) + 'messages'
         params = { 'msg_ids': msg_ids }
-        body = None
-        messages = self.send("GET", url, body, params = params)
+        messages = self.send("GET", url, params = params)
         return messages
 
     def get_users(self, time_unit,start,duration):
@@ -37,8 +35,7 @@ def get_users(self, time_unit,start,duration):
             'start': start,
             'duration': duration
         }
-        body = None
-        users = self.send("GET", url, body, params = params)
+        users = self.send("GET", url, params = params)
         return users
 
 

jpush/schedule/core.py

@@ -11,7 +11,7 @@ def __init__(self, jpush, zone = None):
         self._jpush = jpush
         self.zone = zone or jpush.zone
 
-    def send(self, method, url, body, content_type=None, version=3, params = None):
+    def send(self, method, url, body = None, content_type=None, version=3, params = None):
         response = self._jpush._request(method, body, url, content_type, version=3, params = params)
         return ScheduleResponse(response)
 
@@ -23,15 +23,13 @@ def post_schedule(self, schedulepayload):
 
     def get_schedule_by_id(self, schedule_id):
         url = common.get_url('schedule', self.zone) + schedule_id
-        body = None
-        result = self.send("GET", url, body)
+        result = self.send("GET", url)
         return result
 
     def get_schedule_list(self, page = 1):
         url = common.get_url('schedule', self.zone)
         params = { 'page': page }
-        body = None
-        result = self.send("GET", url, body, params = params)
+        result = self.send("GET", url, params = params)
         return result
 
     def put_schedule(self, schedulepayload, schedule_id):
@@ -42,8 +40,7 @@ def put_schedule(self, schedulepayload, schedule_id):
 
     def delete_schedule(self,schedule_id):
         url = common.get_url('schedule', self.zone) + schedule_id
-        body = None
-        result = self.send("DELETE", url, body)
+        result = self.send("DELETE", url)
         return result