Merge branch 'main' into avm99963-monorail
Merged commit cd4b3b336f1f14afa02990fdc2eec5d9467a827e
GitOrigin-RevId: e67bbf185d5538e1472bb42e0abb2a141f88bac1
diff --git a/tracker/tracker_views.py b/tracker/tracker_views.py
index 0c54555..c2687db 100644
--- a/tracker/tracker_views.py
+++ b/tracker/tracker_views.py
@@ -12,7 +12,7 @@
import logging
import re
import time
-import urllib
+from six.moves import urllib
from google.appengine.api import app_identity
import ezt
@@ -252,9 +252,12 @@
self.thumbnail_url = gcs_helpers.SignUrl(bucket_name,
gcs_object + '-thumbnail')
self.viewurl = (
- gcs_helpers.SignUrl(bucket_name, gcs_object) + '&' + urllib.urlencode(
- {'response-content-displacement':
- ('attachment; filename=%s' % self.filename)}))
+ gcs_helpers.SignUrl(bucket_name, gcs_object) + '&' +
+ urllib.parse.urlencode(
+ {
+ 'response-content-displacement':
+ ('attachment; filename=%s' % self.filename)
+ }))
class AttachmentView(template_helpers.PBProxy):