Ensuring page token is bytes, fixes GoogleCloudPlatform#51 and GoogleCloudPlatform#48

Jon Wayne Parrott · Jon Wayne Parrott · commit c7d8e60b2e8c · 2016-04-18T10:14:53.000-07:00
diff --git a/2-structured-data/bookshelf/crud.py b/2-structured-data/bookshelf/crud.py
@@ -23,6 +23,9 @@
 @crud.route("/")
 def list():
     token = request.args.get('page_token', None)
+    if token:
+        token = token.encode('utf-8')
+
     books, next_page_token = get_model().list(cursor=token)
 
     return render_template(
diff --git a/3-binary-data/bookshelf/crud.py b/3-binary-data/bookshelf/crud.py
@@ -45,6 +45,9 @@ def upload_image_file(file):
 @crud.route("/")
 def list():
     token = request.args.get('page_token', None)
+    if token:
+        token = token.encode('utf-8')
+
     books, next_page_token = get_model().list(cursor=token)
 
     return render_template(
diff --git a/4-auth/bookshelf/crud.py b/4-auth/bookshelf/crud.py
@@ -43,6 +43,9 @@ def upload_image_file(file):
 @crud.route("/")
 def list():
     token = request.args.get('page_token', None)
+    if token:
+        token = token.encode('utf-8')
+
     books, next_page_token = get_model().list(cursor=token)
 
     return render_template(
@@ -56,6 +59,8 @@ def list():
 @oauth2.required
 def list_mine():
     token = request.args.get('page_token', None)
+    if token:
+        token = token.encode('utf-8')
 
     books, next_page_token = get_model().list_by_user(
         user_id=session['profile']['id'],
diff --git a/5-logging/bookshelf/crud.py b/5-logging/bookshelf/crud.py
@@ -43,6 +43,9 @@ def upload_image_file(file):
 @crud.route("/")
 def list():
     token = request.args.get('page_token', None)
+    if token:
+        token = token.encode('utf-8')
+
     books, next_page_token = get_model().list(cursor=token)
 
     return render_template(
@@ -55,6 +58,8 @@ def list():
 @oauth2.required
 def list_mine():
     token = request.args.get('page_token', None)
+    if token:
+        token = token.encode('utf-8')
 
     books, next_page_token = get_model().list_by_user(
         user_id=session['profile']['id'],
diff --git a/6-pubsub/bookshelf/crud.py b/6-pubsub/bookshelf/crud.py
@@ -43,6 +43,9 @@ def upload_image_file(file):
 @crud.route("/")
 def list():
     token = request.args.get('page_token', None)
+    if token:
+        token = token.encode('utf-8')
+
     books, next_page_token = get_model().list(cursor=token)
 
     return render_template(
@@ -55,6 +58,8 @@ def list():
 @oauth2.required
 def list_mine():
     token = request.args.get('page_token', None)
+    if token:
+        token = token.encode('utf-8')
 
     books, next_page_token = get_model().list_by_user(
         user_id=session['profile']['id'],
diff --git a/7-gce/bookshelf/crud.py b/7-gce/bookshelf/crud.py
@@ -43,6 +43,9 @@ def upload_image_file(file):
 @crud.route("/")
 def list():
     token = request.args.get('page_token', None)
+    if token:
+        token = token.encode('utf-8')
+
     books, next_page_token = get_model().list(cursor=token)
 
     return render_template(
@@ -55,6 +58,8 @@ def list():
 @oauth2.required
 def list_mine():
     token = request.args.get('page_token', None)
+    if token:
+        token = token.encode('utf-8')
 
     books, next_page_token = get_model().list_by_user(
         user_id=session['profile']['id'],
diff --git a/optional-container-engine/bookshelf/crud.py b/optional-container-engine/bookshelf/crud.py
@@ -43,6 +43,9 @@ def upload_image_file(file):
 @crud.route("/")
 def list():
     token = request.args.get('page_token', None)
+    if token:
+        token = token.encode('utf-8')
+
     books, next_page_token = get_model().list(cursor=token)
 
     return render_template(
@@ -55,6 +58,8 @@ def list():
 @oauth2.required
 def list_mine():
     token = request.args.get('page_token', None)
+    if token:
+        token = token.encode('utf-8')
 
     books, next_page_token = get_model().list_by_user(
         user_id=session['profile']['id'],
