spanner fixes to enable 3.7 googleapis#5282 (googleapis#5288)

crwilcox · web-flow · commit 92a35e1b49ac · 2018-05-03T10:06:37.000-07:00
* spanner fixes to enable 3.7 googleapis#5282
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: googleapis/nox:0.17.0
+      - image: googleapis/nox:0.18.2
     steps:
       - checkout
       - run:
diff --git a/spanner/google/cloud/spanner_v1/streamed.py b/spanner/google/cloud/spanner_v1/streamed.py
@@ -137,7 +137,10 @@ def __iter__(self):
         iter_rows, self._rows[:] = self._rows[:], ()
         while True:
             if not iter_rows:
-                self._consume_next()  # raises StopIteration
+                try:
+                    self._consume_next()
+                except StopIteration:
+                    return
                 iter_rows, self._rows[:] = self._rows[:], ()
             while iter_rows:
                 yield iter_rows.pop(0)
diff --git a/spanner/nox.py b/spanner/nox.py
@@ -55,7 +55,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
