launchpad-reviewers team mailing list archive

["Thiago F. Pappacena" <pappacena@xxxxxxxxx>]

Thiago F. Pappacena has proposed merging ~pappacena/turnip:py3-pack-git-bin-strings into turnip:master.

Commit message:
Making SAFE_PARAMS a set of bytes, and store.init_repo call to use str for paths (like the API does)

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~pappacena/turnip/+git/turnip/+merge/391243
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~pappacena/turnip:py3-pack-git-bin-strings into turnip:master.

diff --git a/turnip/pack/git.py b/turnip/pack/git.py
index be1c956..4407085 100644
--- a/turnip/pack/git.py
+++ b/turnip/pack/git.py
@@ -44,7 +44,7 @@ from turnip.pack.helpers import (
 ERROR_PREFIX = b'ERR '
 VIRT_ERROR_PREFIX = b'turnip virt error: '
 
-SAFE_PARAMS = frozenset(['host', 'version'])
+SAFE_PARAMS = frozenset([b'host', b'version'])
 
 
 class RequestIDLogger(Logger):
@@ -531,10 +531,11 @@ class PackBackendProtocol(PackServerProtocol):
         try:
             repo_path = compose_path(self.factory.root, pathname)
             if clone_from:
-                clone_path = compose_path(self.factory.root, clone_from)
+                clone_path = six.ensure_str(
+                    compose_path(self.factory.root, clone_from))
             else:
                 clone_path = None
-            store.init_repo(repo_path, clone_path)
+            store.init_repo(six.ensure_str(repo_path), clone_path)
             yield proxy.callRemote(
                 "confirmRepoCreation", six.ensure_text(pathname),
                 auth_params).addTimeout(xmlrpc_timeout, default_reactor)