Merge pull request #155 from planetlabs/python3.7

Support Python 3.7 by removing keywords.

Author: sarasafavi

planet/api/downloader.py

@@ -350,7 +350,7 @@ def __init__(self, client, **opts):
         self._opts = opts
         self._stages = []
         self._completed = 0
-        self._awaiting = None
+        self._waiting = None
 
     def activate(self, items, asset_types):
         return self._run(items, asset_types)
@@ -398,10 +398,10 @@ def _run(self, items, asset_types, dest=None):
                         self.on_complete(item, assets[a])
                 # otherwise it is a download
                 else:
-                    item, asset, self._awaiting = n
+                    item, asset, self._waiting = n
                     try:
-                        body = self._awaiting.await()
-                        self._awaiting = None
+                        body = self._waiting.wait()
+                        self._waiting = None
                         dl = os.path.join(self._dest, body.name)
                         self.on_complete(item, asset, dl)
                     except RequestCancelled:
@@ -455,7 +455,7 @@ def stats(self):
     def shutdown(self):
         for s in self._stages:
             s.cancel()
-        self._awaiting and self._awaiting.cancel()
+        self._waiting and self._waiting.cancel()
         self._stages = []
         self._client.shutdown()
 

planet/api/models.py

@@ -52,18 +52,18 @@ def _async_callback(self, session, response):
         check_status(response)
         self._body = self._create_body(response)
         self._handler(self._body)
-        if self._await:
-            self._await(self._body)
+        if self._wait:
+            self._wait(self._body)
 
-    def get_body_async(self, handler, await=None):
+    def get_body_async(self, handler, wait=None):
         if self._future is None:
             self._handler = handler
-            self._await = await
+            self._wait = wait
             self._future = self._dispatcher._dispatch_async(
                 self.request, self._async_callback
             )
 
-    def await(self):
+    def wait(self):
         '''Await completion of this request.
 
         :returns Body: A Body object containing the response.

tests/test_downloader.py

@@ -33,7 +33,7 @@ def write(self, file, callback):
         callback(finish=self)
         self._got_write = True
 
-    def await(self):
+    def wait(self):
         pass
 
     def cancel(self):
@@ -51,7 +51,7 @@ def respond():
         # don't write to the body synchronously
         threading.Timer(WRITE_DELAY, respond).start()
 
-    def await(self):
+    def wait(self):
         return self._future.result()
 
 

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py34, py35, py36
+envlist = py27, py34, py35, py36, py37
 
 [testenv]
 deps = pytest