Decode cursor before passing to template, fixes GoogleCloudPlatform#55

Jon Wayne Parrott · Jon Wayne Parrott · commit 3d3ef13d4301 · 2016-04-25T12:30:15.000-07:00
diff --git a/2-structured-data/bookshelf/model_datastore.py b/2-structured-data/bookshelf/model_datastore.py
@@ -55,7 +55,7 @@ def list(limit=10, cursor=None):
     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 if len(entities) == limit else None
+    return entities, cursor.decode('utf-8') if len(entities) == limit else None
 # [END list]
 
 
diff --git a/3-binary-data/bookshelf/model_datastore.py b/3-binary-data/bookshelf/model_datastore.py
@@ -52,7 +52,7 @@ def list(limit=10, cursor=None):
     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 if len(entities) == limit else None
+    return entities, cursor.decode('utf-8') if len(entities) == limit else None
 
 
 def read(id):
diff --git a/4-auth/bookshelf/model_datastore.py b/4-auth/bookshelf/model_datastore.py
@@ -52,7 +52,7 @@ def list(limit=10, cursor=None):
     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 if len(entities) == limit else None
+    return entities, cursor.decode('utf-8') if len(entities) == limit else None
 
 
 # [START list_by_user]
@@ -67,7 +67,7 @@ def list_by_user(user_id, limit=10, cursor=None):
     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 if len(entities) == limit else None
+    return entities, cursor.decode('utf-8') if len(entities) == limit else None
 # [END list_by_user]
 
 
diff --git a/5-logging/bookshelf/model_datastore.py b/5-logging/bookshelf/model_datastore.py
@@ -52,7 +52,7 @@ def list(limit=10, cursor=None):
     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 if len(entities) == limit else None
+    return entities, cursor.decode('utf-8') if len(entities) == limit else None
 
 
 def list_by_user(user_id, limit=10, cursor=None):
@@ -66,7 +66,7 @@ def list_by_user(user_id, limit=10, cursor=None):
     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 if len(entities) == limit else None
+    return entities, cursor.decode('utf-8') if len(entities) == limit else None
 
 
 def read(id):
diff --git a/6-pubsub/bookshelf/model_datastore.py b/6-pubsub/bookshelf/model_datastore.py
@@ -52,7 +52,7 @@ def list(limit=10, cursor=None):
     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 if len(entities) == limit else None
+    return entities, cursor.decode('utf-8') if len(entities) == limit else None
 
 
 def list_by_user(user_id, limit=10, cursor=None):
@@ -66,7 +66,7 @@ def list_by_user(user_id, limit=10, cursor=None):
     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 if len(entities) == limit else None
+    return entities, cursor.decode('utf-8') if len(entities) == limit else None
 
 
 def read(id):
diff --git a/7-gce/bookshelf/model_datastore.py b/7-gce/bookshelf/model_datastore.py
@@ -52,7 +52,7 @@ def list(limit=10, cursor=None):
     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 if len(entities) == limit else None
+    return entities, cursor.decode('utf-8') if len(entities) == limit else None
 
 
 def list_by_user(user_id, limit=10, cursor=None):
@@ -66,7 +66,7 @@ def list_by_user(user_id, limit=10, cursor=None):
     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 if len(entities) == limit else None
+    return entities, cursor.decode('utf-8') if len(entities) == limit else None
 
 
 def read(id):
diff --git a/optional-container-engine/bookshelf/model_datastore.py b/optional-container-engine/bookshelf/model_datastore.py
@@ -52,7 +52,7 @@ def list(limit=10, cursor=None):
     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 if len(entities) == limit else None
+    return entities, cursor.decode('utf-8') if len(entities) == limit else None
 
 
 def list_by_user(user_id, limit=10, cursor=None):
@@ -66,7 +66,7 @@ def list_by_user(user_id, limit=10, cursor=None):
     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 if len(entities) == limit else None
+    return entities, cursor.decode('utf-8') if len(entities) == limit else None
 
 
 def read(id):
