launchpad-reviewers team mailing list archive

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

Thiago F. Pappacena has proposed merging ~pappacena/turnip:py3-init-repo-bytes into turnip:master.

Commit message:
Fixing regression on repo path as bytes when creating a new repository

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

diff --git a/turnip/pack/git.py b/turnip/pack/git.py
index 0d8292f..4cbf0dc 100644
--- a/turnip/pack/git.py
+++ b/turnip/pack/git.py
@@ -581,16 +581,14 @@ class PackBackendProtocol(PackServerProtocol):
         proxy = xmlrpc.Proxy(xmlrpc_endpoint, allowNone=True)
         repo_path = compose_path(self.factory.root, pathname)
         if clone_from:
-            clone_path = six.ensure_str(
-                compose_path(self.factory.root, clone_from))
+            clone_path = compose_path(self.factory.root, clone_from)
         else:
             clone_path = None
         try:
             self.log.info(
                 "Creating repository %s, clone of %s" %
                 (repo_path, clone_path))
-            store.init_repo(six.ensure_str(repo_path), clone_path,
-                            log=self.log)
+            store.init_repo(repo_path, clone_path, log=self.log)
             self.log.info(
                 "Confirming with Launchpad repo %s creation." % repo_path)
             yield proxy.callRemote(