Merge pull request #30 from imankulov/remove_collapse_key_exception

Remove GCMNoCollapseKeyException

Author: geeknam

gcm/gcm.py

@@ -13,7 +13,6 @@ class GCMMalformedJsonException(GCMException): pass
 class GCMConnectionException(GCMException): pass
 class GCMAuthenticationException(GCMException): pass
 class GCMTooManyRegIdsException(GCMException): pass
-class GCMNoCollapseKeyException(GCMException): pass
 class GCMInvalidTtlException(GCMException): pass
 
 # Exceptions from Google responses
@@ -99,7 +98,6 @@ def construct_payload(self, registration_ids, data=None, collapse_key=None,
 
         :return constructed dict or JSON payload
         :raises GCMInvalidTtlException: if time_to_live is invalid
-        :raises GCMNoCollapseKeyException: if collapse_key is missing when time_to_live is used
         """
 
         if time_to_live:
@@ -123,8 +121,6 @@ def construct_payload(self, registration_ids, data=None, collapse_key=None,
 
         if time_to_live >= 0:
             payload['time_to_live'] = time_to_live
-            if collapse_key is None:
-                raise GCMNoCollapseKeyException("collapse_key is required when time_to_live is provided")
 
         if collapse_key:
             payload['collapse_key'] = collapse_key

gcm/test.py

@@ -80,10 +80,6 @@ def test_construct_payload(self):
         for arg in ['registration_ids', 'data', 'collapse_key', 'delay_while_idle', 'time_to_live']:
             self.assertIn(arg, payload)
 
-    def test_require_collapse_key(self):
-        with self.assertRaises(GCMNoCollapseKeyException):
-            self.gcm.construct_payload(registration_ids='1234', data=self.data, time_to_live=3600)
-
     def test_json_payload(self):
         reg_ids = ['12', '145', '56']
         json_payload = self.gcm.construct_payload(registration_ids=reg_ids, data=self.data)