Merge remote-tracking branch 'upstream/master'

Author: infothrill

pypingdom/client.py

@@ -71,6 +71,10 @@ def update_check(self, check, changes):
         data = check.to_json()
         if data == cached_definition:
             return False
+        if check.type != 'http':
+            # GET /checks (get_checks) returns 'verify_certificate' regardless
+            # check type. Remove from PUT data for non http checks
+            del data['verify_certificate']
         del data["type"]  # type can't be changed
         self.api.send(method='put', resource='checks', resource_id=check._id, data=data)
         check.from_json(self.api.send('get', "checks", check._id)['check'])