Merge remote-tracking branch 'upstream/master'

Author: infothrill

Changelog.rst

@@ -0,0 +1,5 @@
+0.2.0
+=====
+* added changelog
+* switched legacy, unsupported maintenance window getter to supported rest
+  api method

pypingdom/client.py

@@ -77,26 +77,23 @@ def update_check(self, check, changes):
         return check
 
     def get_maintenances(self, filters=None):
+        """Return a list of mainenance windows."""
         if filters is None:
             filters = {}
-        self.gui.login()
-        url = "https://my.pingdom.com/newims/maintenance/xhr?limit=10000&page_id=1&_=1489571119019"
-        response = self.gui.send("get", url)
         res = []
-        for obj in response.json()['events']:
+        for mw in (Maintenance(self, json=x) for x in self.api.send('get', 'maintenance')['maintenance']):
             if "checks" in filters:
                 wanted_ids = [check._id for check in filters['checks']]
-                got_ids = [int(x['compound_id']) for x in obj['checks']]
+                got_ids = [x._id for x in mw.checks]
                 if len(set(wanted_ids).intersection(set(got_ids))) == 0:
                     continue
-            window = Maintenance(self, json=obj)
-            if "names" in filters and window.name not in filters['names']:
+            if "names" in filters and mw.description not in filters['names']:
                 continue
-            if "after" in filters and filters["after"] >= window.start:
+            if "after" in filters and filters["after"] >= mw.start:
                 continue
-            if "before" in filters and filters["before"] <= window.stop:
+            if "before" in filters and filters["before"] <= mw.stop:
                 continue
-            res.append(window)
+            res.append(mw)
         return res
 
     def create_maintenance(self, obj):

pypingdom/maintenance.py

@@ -54,9 +54,9 @@ def to_json(self):
     def from_json(self, obj):
         self._id = int(obj['id'])
         self.name = obj["description"]
-        self.start = datetime.datetime.fromtimestamp(obj['start'])
-        self.stop = datetime.datetime.fromtimestamp(obj['end'])
-        self.checks = [self.client.get_check(_id=int(x['compound_id'])) for x in obj['checks']]
+        self.start = datetime.datetime.fromtimestamp(obj['from'])
+        self.stop = datetime.datetime.fromtimestamp(obj['to'])
+        self.checks = [self.client.get_check(_id=int(x)) for x in obj['checks']['uptime']]
 
     def from_obj(self, obj):
         self.name = obj["name"]

setup.py

@@ -14,7 +14,7 @@
 
 
 setup(name='pypingdom',
-      version="0.1.5",
+      version="0.2.0",
       description='Client for Pingdom Services',
       long_description=README,
       author='Paolo Sechi',