Merge pull request GoogleCloudPlatform#100 from GoogleCloudPlatform/gcloud-update

waprin · web-flow · commit 9329c4328d33 · 2016-11-16T12:28:01.000-08:00
Update to latest google-cloud-python
diff --git a/2-structured-data/bookshelf/model_datastore.py b/2-structured-data/bookshelf/model_datastore.py
@@ -51,11 +51,17 @@ def from_datastore(entity):
 # [START list]
 def list(limit=10, cursor=None):
     ds = get_client()
+
     query = ds.query(kind='Book', order=['title'])
-    it = query.fetch(limit=limit, start_cursor=cursor)
-    entities, more_results, cursor = it.next_page()
-    entities = builtin_list(map(from_datastore, entities))
-    return entities, cursor.decode('utf-8') if len(entities) == limit else None
+    query_iterator = query.fetch(limit=limit, start_cursor=cursor)
+    page = next(query_iterator.pages)
+
+    entities = builtin_list(map(from_datastore, page))
+    next_cursor = (
+        query_iterator.next_page_token.decode('utf-8')
+        if query_iterator.next_page_token else None)
+
+    return entities, next_cursor
 # [END list]
 
 
diff --git a/2-structured-data/requirements-dev.txt b/2-structured-data/requirements-dev.txt
@@ -1,5 +1,5 @@
 tox==2.4.1
-flake8==3.1.0
+flake8==3.2.0
 flaky==3.3.0
 pytest==3.0.4
 pytest-cov==2.4.0
diff --git a/2-structured-data/requirements.txt b/2-structured-data/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.11.1
-google-cloud==0.20.0
+google-cloud==0.21.0
 gunicorn==19.6.0
 oauth2client==4.0.0
 Flask-SQLAlchemy==2.1
diff --git a/3-binary-data/bookshelf/model_datastore.py b/3-binary-data/bookshelf/model_datastore.py
@@ -48,11 +48,17 @@ def from_datastore(entity):
 
 def list(limit=10, cursor=None):
     ds = get_client()
+
     query = ds.query(kind='Book', order=['title'])
-    it = query.fetch(limit=limit, start_cursor=cursor)
-    entities, more_results, cursor = it.next_page()
-    entities = builtin_list(map(from_datastore, entities))
-    return entities, cursor.decode('utf-8') if len(entities) == limit else None
+    query_iterator = query.fetch(limit=limit, start_cursor=cursor)
+    page = next(query_iterator.pages)
+
+    entities = builtin_list(map(from_datastore, page))
+    next_cursor = (
+        query_iterator.next_page_token.decode('utf-8')
+        if query_iterator.next_page_token else None)
+
+    return entities, next_cursor
 
 
 def read(id):
diff --git a/3-binary-data/requirements-dev.txt b/3-binary-data/requirements-dev.txt
@@ -1,5 +1,5 @@
 tox==2.4.1
-flake8==3.1.0
+flake8==3.2.0
 flaky==3.3.0
 pytest==3.0.4
 pytest-cov==2.4.0
diff --git a/3-binary-data/requirements.txt b/3-binary-data/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.11.1
-google-cloud==0.20.0
+google-cloud==0.21.0
 gunicorn==19.6.0
 oauth2client==4.0.0
 Flask-SQLAlchemy==2.1
diff --git a/4-auth/bookshelf/model_datastore.py b/4-auth/bookshelf/model_datastore.py
@@ -48,11 +48,17 @@ def from_datastore(entity):
 
 def list(limit=10, cursor=None):
     ds = get_client()
+
     query = ds.query(kind='Book', order=['title'])
-    it = query.fetch(limit=limit, start_cursor=cursor)
-    entities, more_results, cursor = it.next_page()
-    entities = builtin_list(map(from_datastore, entities))
-    return entities, cursor.decode('utf-8') if len(entities) == limit else None
+    query_iterator = query.fetch(limit=limit, start_cursor=cursor)
+    page = next(query_iterator.pages)
+
+    entities = builtin_list(map(from_datastore, page))
+    next_cursor = (
+        query_iterator.next_page_token.decode('utf-8')
+        if query_iterator.next_page_token else None)
+
+    return entities, next_cursor
 
 
 # [START list_by_user]
@@ -64,10 +70,16 @@ def list_by_user(user_id, limit=10, cursor=None):
             ('createdById', '=', user_id)
         ]
     )
-    it = query.fetch(limit=limit, start_cursor=cursor)
-    entities, more_results, cursor = it.next_page()
-    entities = builtin_list(map(from_datastore, entities))
-    return entities, cursor.decode('utf-8') if len(entities) == limit else None
+
+    query_iterator = query.fetch(limit=limit, start_cursor=cursor)
+    page = next(query_iterator.pages)
+
+    entities = builtin_list(map(from_datastore, page))
+    next_cursor = (
+        query_iterator.next_page_token.decode('utf-8')
+        if query_iterator.next_page_token else None)
+
+    return entities, next_cursor
 # [END list_by_user]
 
 
diff --git a/4-auth/requirements-dev.txt b/4-auth/requirements-dev.txt
@@ -1,5 +1,5 @@
 tox==2.4.1
-flake8==3.1.0
+flake8==3.2.0
 flaky==3.3.0
 pytest==3.0.4
 pytest-cov==2.4.0
diff --git a/4-auth/requirements.txt b/4-auth/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.11.1
-google-cloud==0.20.0
+google-cloud==0.21.0
 gunicorn==19.6.0
 oauth2client==4.0.0
 Flask-SQLAlchemy==2.1
diff --git a/5-logging/bookshelf/model_datastore.py b/5-logging/bookshelf/model_datastore.py
@@ -48,11 +48,17 @@ def from_datastore(entity):
 
 def list(limit=10, cursor=None):
     ds = get_client()
+
     query = ds.query(kind='Book', order=['title'])
-    it = query.fetch(limit=limit, start_cursor=cursor)
-    entities, more_results, cursor = it.next_page()
-    entities = builtin_list(map(from_datastore, entities))
-    return entities, cursor.decode('utf-8') if len(entities) == limit else None
+    query_iterator = query.fetch(limit=limit, start_cursor=cursor)
+    page = next(query_iterator.pages)
+
+    entities = builtin_list(map(from_datastore, page))
+    next_cursor = (
+        query_iterator.next_page_token.decode('utf-8')
+        if query_iterator.next_page_token else None)
+
+    return entities, next_cursor
 
 
 def list_by_user(user_id, limit=10, cursor=None):
@@ -63,10 +69,16 @@ def list_by_user(user_id, limit=10, cursor=None):
             ('createdById', '=', user_id)
         ]
     )
-    it = query.fetch(limit=limit, start_cursor=cursor)
-    entities, more_results, cursor = it.next_page()
-    entities = builtin_list(map(from_datastore, entities))
-    return entities, cursor.decode('utf-8') if len(entities) == limit else None
+
+    query_iterator = query.fetch(limit=limit, start_cursor=cursor)
+    page = next(query_iterator.pages)
+
+    entities = builtin_list(map(from_datastore, page))
+    next_cursor = (
+        query_iterator.next_page_token.decode('utf-8')
+        if query_iterator.next_page_token else None)
+
+    return entities, next_cursor
 
 
 def read(id):
diff --git a/5-logging/requirements-dev.txt b/5-logging/requirements-dev.txt
@@ -1,5 +1,5 @@
 tox==2.4.1
-flake8==3.1.0
+flake8==3.2.0
 flaky==3.3.0
 pytest==3.0.4
 pytest-cov==2.4.0
diff --git a/5-logging/requirements.txt b/5-logging/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.11.1
-google-cloud==0.20.0
+google-cloud==0.21.0
 gunicorn==19.6.0
 oauth2client==4.0.0
 Flask-SQLAlchemy==2.1
diff --git a/6-pubsub/bookshelf/model_datastore.py b/6-pubsub/bookshelf/model_datastore.py
@@ -48,11 +48,17 @@ def from_datastore(entity):
 
 def list(limit=10, cursor=None):
     ds = get_client()
+
     query = ds.query(kind='Book', order=['title'])
-    it = query.fetch(limit=limit, start_cursor=cursor)
-    entities, more_results, cursor = it.next_page()
-    entities = builtin_list(map(from_datastore, entities))
-    return entities, cursor.decode('utf-8') if len(entities) == limit else None
+    query_iterator = query.fetch(limit=limit, start_cursor=cursor)
+    page = next(query_iterator.pages)
+
+    entities = builtin_list(map(from_datastore, page))
+    next_cursor = (
+        query_iterator.next_page_token.decode('utf-8')
+        if query_iterator.next_page_token else None)
+
+    return entities, next_cursor
 
 
 def list_by_user(user_id, limit=10, cursor=None):
@@ -63,10 +69,16 @@ def list_by_user(user_id, limit=10, cursor=None):
             ('createdById', '=', user_id)
         ]
     )
-    it = query.fetch(limit=limit, start_cursor=cursor)
-    entities, more_results, cursor = it.next_page()
-    entities = builtin_list(map(from_datastore, entities))
-    return entities, cursor.decode('utf-8') if len(entities) == limit else None
+
+    query_iterator = query.fetch(limit=limit, start_cursor=cursor)
+    page = next(query_iterator.pages)
+
+    entities = builtin_list(map(from_datastore, page))
+    next_cursor = (
+        query_iterator.next_page_token.decode('utf-8')
+        if query_iterator.next_page_token else None)
+
+    return entities, next_cursor
 
 
 def read(id):
diff --git a/6-pubsub/requirements-dev.txt b/6-pubsub/requirements-dev.txt
@@ -1,9 +1,9 @@
 tox==2.4.1
-flake8==3.1.0
+flake8==3.2.0
 flaky==3.3.0
 mock==2.0.0
 pytest==3.0.4
 pytest-cov==2.4.0
 BeautifulSoup4==4.5.1
-requests==2.11.1
+requests==2.12.0
 retrying==1.3.3
diff --git a/6-pubsub/requirements.txt b/6-pubsub/requirements.txt
@@ -1,12 +1,12 @@
 Flask==0.11.1
-google-cloud==0.20.0
+google-cloud==0.21.0
 gunicorn==19.6.0
 oauth2client==4.0.0
 Flask-SQLAlchemy==2.1
 PyMySQL==0.7.9
 Flask-PyMongo==0.4.1
 PyMongo==3.3.1
 six==1.10.0
-requests[security]==2.11.1
+requests[security]==2.12.0
 honcho==0.7.1
 psq==0.5.0
diff --git a/7-gce/bookshelf/model_datastore.py b/7-gce/bookshelf/model_datastore.py
@@ -48,11 +48,17 @@ def from_datastore(entity):
 
 def list(limit=10, cursor=None):
     ds = get_client()
+
     query = ds.query(kind='Book', order=['title'])
-    it = query.fetch(limit=limit, start_cursor=cursor)
-    entities, more_results, cursor = it.next_page()
-    entities = builtin_list(map(from_datastore, entities))
-    return entities, cursor.decode('utf-8') if len(entities) == limit else None
+    query_iterator = query.fetch(limit=limit, start_cursor=cursor)
+    page = next(query_iterator.pages)
+
+    entities = builtin_list(map(from_datastore, page))
+    next_cursor = (
+        query_iterator.next_page_token.decode('utf-8')
+        if query_iterator.next_page_token else None)
+
+    return entities, next_cursor
 
 
 def list_by_user(user_id, limit=10, cursor=None):
@@ -63,10 +69,16 @@ def list_by_user(user_id, limit=10, cursor=None):
             ('createdById', '=', user_id)
         ]
     )
-    it = query.fetch(limit=limit, start_cursor=cursor)
-    entities, more_results, cursor = it.next_page()
-    entities = builtin_list(map(from_datastore, entities))
-    return entities, cursor.decode('utf-8') if len(entities) == limit else None
+
+    query_iterator = query.fetch(limit=limit, start_cursor=cursor)
+    page = next(query_iterator.pages)
+
+    entities = builtin_list(map(from_datastore, page))
+    next_cursor = (
+        query_iterator.next_page_token.decode('utf-8')
+        if query_iterator.next_page_token else None)
+
+    return entities, next_cursor
 
 
 def read(id):
diff --git a/7-gce/requirements-dev.txt b/7-gce/requirements-dev.txt
@@ -1,9 +1,9 @@
 tox==2.4.1
-flake8==3.1.0
+flake8==3.2.0
 flaky==3.3.0
 mock==2.0.0
 pytest==3.0.4
 pytest-cov==2.4.0
 BeautifulSoup4==4.5.1
-requests==2.11.1
+requests==2.12.0
 retrying==1.3.3
diff --git a/7-gce/requirements.txt b/7-gce/requirements.txt
@@ -1,12 +1,12 @@
 Flask==0.11.1
-google-cloud==0.20.0
+google-cloud==0.21.0
 gunicorn==19.6.0
 oauth2client==4.0.0
 Flask-SQLAlchemy==2.1
 PyMySQL==0.7.9
 Flask-PyMongo==0.4.1
 PyMongo==3.3.1
 six==1.10.0
-requests[security]==2.11.1
+requests[security]==2.12.0
 honcho==0.7.1
 psq==0.5.0
diff --git a/optional-container-engine/bookshelf/model_datastore.py b/optional-container-engine/bookshelf/model_datastore.py
@@ -48,11 +48,17 @@ def from_datastore(entity):
 
 def list(limit=10, cursor=None):
     ds = get_client()
+
     query = ds.query(kind='Book', order=['title'])
-    it = query.fetch(limit=limit, start_cursor=cursor)
-    entities, more_results, cursor = it.next_page()
-    entities = builtin_list(map(from_datastore, entities))
-    return entities, cursor.decode('utf-8') if len(entities) == limit else None
+    query_iterator = query.fetch(limit=limit, start_cursor=cursor)
+    page = next(query_iterator.pages)
+
+    entities = builtin_list(map(from_datastore, page))
+    next_cursor = (
+        query_iterator.next_page_token.decode('utf-8')
+        if query_iterator.next_page_token else None)
+
+    return entities, next_cursor
 
 
 def list_by_user(user_id, limit=10, cursor=None):
@@ -63,10 +69,16 @@ def list_by_user(user_id, limit=10, cursor=None):
             ('createdById', '=', user_id)
         ]
     )
-    it = query.fetch(limit=limit, start_cursor=cursor)
-    entities, more_results, cursor = it.next_page()
-    entities = builtin_list(map(from_datastore, entities))
-    return entities, cursor.decode('utf-8') if len(entities) == limit else None
+
+    query_iterator = query.fetch(limit=limit, start_cursor=cursor)
+    page = next(query_iterator.pages)
+
+    entities = builtin_list(map(from_datastore, page))
+    next_cursor = (
+        query_iterator.next_page_token.decode('utf-8')
+        if query_iterator.next_page_token else None)
+
+    return entities, next_cursor
 
 
 def read(id):
diff --git a/optional-container-engine/requirements-dev.txt b/optional-container-engine/requirements-dev.txt
@@ -1,8 +1,8 @@
 tox==2.4.1
-flake8==3.1.0
+flake8==3.2.0
 flaky==3.3.0
 pytest==3.0.4
 pytest-cov==2.4.0
 BeautifulSoup4==4.5.1
-requests==2.11.1
+requests==2.12.0
 retrying==1.3.3
diff --git a/optional-container-engine/requirements.txt b/optional-container-engine/requirements.txt
@@ -1,5 +1,5 @@
 Flask==0.11.1
-google-cloud==0.20.0
+google-cloud==0.21.0
 gunicorn==19.6.0
 oauth2client==4.0.0
 mock==2.0.0
@@ -8,6 +8,6 @@ PyMySQL==0.7.9
 Flask-PyMongo==0.4.1
 PyMongo==3.3.1
 six==1.10.0
-requests[security]==2.11.1
+requests[security]==2.12.0
 honcho==0.7.1
 psq==0.5.0
