launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:py3-b32encode-bytes into launchpad:master.

Commit message:
Handle output of base64.b32encode as bytes

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/396861
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-b32encode-bytes into launchpad:master.

diff --git a/lib/lp/code/browser/tests/test_gitrepository.py b/lib/lp/code/browser/tests/test_gitrepository.py
index f6b3224..5a17f6e 100644
--- a/lib/lp/code/browser/tests/test_gitrepository.py
+++ b/lib/lp/code/browser/tests/test_gitrepository.py
@@ -1438,7 +1438,7 @@ class TestGitRepositoryPermissionsView(BrowserTestCase):
         login_person(repository.owner)
         view = create_initialized_view(repository, name="+permissions")
         encoded_ref_pattern = base64.b32encode(
-            b"refs/heads/*").replace("=", "_").decode("UTF-8")
+            b"refs/heads/*").decode("UTF-8").replace("=", "_")
         self.assertEqual(
             "field.%s" % encoded_ref_pattern,
             view._getFieldName("field", "refs/heads/*"))
@@ -1448,7 +1448,7 @@ class TestGitRepositoryPermissionsView(BrowserTestCase):
         login_person(repository.owner)
         view = create_initialized_view(repository, name="+permissions")
         encoded_ref_pattern = base64.b32encode(
-            b"refs/tags/*").replace("=", "_").decode("UTF-8")
+            b"refs/tags/*").decode("UTF-8").replace("=", "_")
         self.assertEqual(
             "field.%s._repository_owner" % encoded_ref_pattern,
             view._getFieldName(
@@ -1461,7 +1461,7 @@ class TestGitRepositoryPermissionsView(BrowserTestCase):
         login_person(repository.owner)
         view = create_initialized_view(repository, name="+permissions")
         encoded_ref_pattern = base64.b32encode(
-            b"refs/*").replace("=", "_").decode("UTF-8")
+            b"refs/*").decode("UTF-8").replace("=", "_")
         self.assertEqual(
             "field.%s.%s" % (encoded_ref_pattern, grantee.id),
             view._getFieldName("field", "refs/*", grantee=grantee))
@@ -1484,7 +1484,7 @@ class TestGitRepositoryPermissionsView(BrowserTestCase):
         login_person(repository.owner)
         view = create_initialized_view(repository, name="+permissions")
         encoded_ref_pattern = base64.b32encode(
-            b"refs/heads/*").replace("=", "_").decode("UTF-8")
+            b"refs/heads/*").decode("UTF-8").replace("=", "_")
         self.assertEqual(
             ("permissions", "refs/heads/*", None),
             view._parseFieldName("permissions.%s" % encoded_ref_pattern))
@@ -1494,7 +1494,7 @@ class TestGitRepositoryPermissionsView(BrowserTestCase):
         login_person(repository.owner)
         view = create_initialized_view(repository, name="+permissions")
         encoded_ref_pattern = base64.b32encode(
-            b"refs/tags/*").replace("=", "_").decode("UTF-8")
+            b"refs/tags/*").decode("UTF-8").replace("=", "_")
         self.assertRaises(
             UnexpectedFormData, view._parseFieldName,
             "field.%s._nonsense" % encoded_ref_pattern)
@@ -1507,7 +1507,7 @@ class TestGitRepositoryPermissionsView(BrowserTestCase):
         login_person(repository.owner)
         view = create_initialized_view(repository, name="+permissions")
         encoded_ref_pattern = base64.b32encode(
-            b"refs/tags/*").replace("=", "_").decode("UTF-8")
+            b"refs/tags/*").decode("UTF-8").replace("=", "_")
         self.assertEqual(
             ("pattern", "refs/tags/*", GitGranteeType.REPOSITORY_OWNER),
             view._parseFieldName(
@@ -1519,7 +1519,7 @@ class TestGitRepositoryPermissionsView(BrowserTestCase):
         login_person(repository.owner)
         view = create_initialized_view(repository, name="+permissions")
         encoded_ref_pattern = base64.b32encode(
-            b"refs/*").replace("=", "_").decode("UTF-8")
+            b"refs/*").decode("UTF-8").replace("=", "_")
         self.assertRaises(
             UnexpectedFormData, view._parseFieldName,
             "delete.%s.%s" % (encoded_ref_pattern, grantee.id * 2))
@@ -1530,7 +1530,7 @@ class TestGitRepositoryPermissionsView(BrowserTestCase):
         login_person(repository.owner)
         view = create_initialized_view(repository, name="+permissions")
         encoded_ref_pattern = base64.b32encode(
-            b"refs/*").replace("=", "_").decode("UTF-8")
+            b"refs/*").decode("UTF-8").replace("=", "_")
         self.assertEqual(
             ("delete", "refs/*", grantee),
             view._parseFieldName(