Merge pull request #5461 from nsoranzo/python3

Python3: make encoded id JSON-serializable

lib/galaxy/web/security/__init__.py

@@ -37,7 +37,7 @@ def encode_id(self, obj_id, kind=None):
         # Pad to a multiple of 8 with leading "!"
         s = (b"!" * (8 - len(s) % 8)) + s
         # Encrypt
-        return codecs.encode(id_cipher.encrypt(s), 'hex')
+        return unicodify(codecs.encode(id_cipher.encrypt(s), 'hex'))
 
     def encode_dict_ids(self, a_dict, kind=None, skip_startswith=None):
         """

test/functional/twilltestcase.py

@@ -16,6 +16,7 @@
 from twill.other_packages._mechanize_dist import ClientForm
 
 from base.testcase import FunctionalTestCase  # noqa: I100,I202
+from galaxy.util import unicodify  # noqa: I201
 
 # Force twill to log to a buffer -- FIXME: Should this go to stdout and be captured by nose?
 buffer = StringIO()
@@ -65,7 +66,7 @@ def check_page(self, strings_displayed, strings_displayed_count, strings_not_dis
 
     def check_page_for_string(self, patt):
         """Looks for 'patt' in the current browser page"""
-        page = self.last_page()
+        page = unicodify(self.last_page())
         if page.find(patt) == -1:
             fname = self.write_temp_file(page)
             errmsg = "no match to '%s'\npage content written to '%s'\npage: [[%s]]" % (patt, fname, page)
@@ -205,6 +206,10 @@ def json_from_url(self, url, params={}):
         return loads(self.last_page())
 
     def last_page(self):
+        """
+        Return the last visited page (usually HTML, but can binary data as
+        well).
+        """
         return tc.browser.get_html()
 
     def last_url(self):