Merge ~pappacena/turnip:fix-bytes-str-mix into turnip:master

[Thiago F. Pappacena]

Fixing bytes/str confusions to make it more compatible with python3.

2321c0b... by Thiago F. Pappacena on 2020-05-13

Fixing a few more binary/str mixing

[Colin Watson (cjwatson)]

Could you fix the mis-sorted imports? Otherwise good.

review: Approve

476a7dd... by Thiago F. Pappacena on 2020-05-14

Sorting imports

diff --git a/Makefile b/Makefile
index 9e6bb12..8407a6a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 # Copyright 2005-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-ENV := $(CURDIR)/env
-PY3_ENV := $(CURDIR)/py3env
+ENV ?= $(CURDIR)/env
+PY3_ENV ?= $(CURDIR)/py3env
 PIP_CACHE = $(CURDIR)/pip-cache
 
 PYTHON := $(ENV)/bin/python
@@ -12,7 +12,7 @@ PIP := $(ENV)/bin/pip
 VIRTUALENV := virtualenv
 
 DEPENDENCIES_URL := https://git.launchpad.net/~canonical-launchpad-branches/turnip/+git/dependencies
-PIP_SOURCE_DIR := dependencies
+PIP_SOURCE_DIR ?= dependencies
 
 PIP_ARGS ?= --quiet
 ifneq ($(PIP_SOURCE_DIR),)
@@ -83,7 +83,7 @@ pip-check: $(ENV)
 check: pip-check test lint
 
 check-python3:
-	$(MAKE) check VENV_ARGS="-p python3" ENV="$(PY3_ENV)"
+	VENV_ARGS="-p python3" ENV="$(PY3_ENV)" $(MAKE) check
 
 check-python-compat: check check-python3
 
diff --git a/turnip/helpers.py b/turnip/helpers.py
index a423aff..77e12ed 100644
--- a/turnip/helpers.py
+++ b/turnip/helpers.py
@@ -9,12 +9,16 @@ from __future__ import (
 
 import os.path
 
+import six
+
 
 def compose_path(root, path):
     # Construct the full path, stripping any leading slashes so we
     # resolve absolute paths within the root.
+    root = six.ensure_binary(root, "utf-8")
     full_path = os.path.abspath(os.path.join(
-        root, path.lstrip(os.path.sep.encode('utf-8'))))
+        root,
+        path.lstrip(six.ensure_binary(os.path.sep, 'utf-8'))))
     if not full_path.startswith(os.path.abspath(root)):
         raise ValueError('Path not contained within root')
     return full_path
diff --git a/turnip/pack/helpers.py b/turnip/pack/helpers.py
index f4381bb..533c967 100644
--- a/turnip/pack/helpers.py
+++ b/turnip/pack/helpers.py
@@ -19,6 +19,7 @@ from tempfile import (
     )
 
 from pygit2 import Repository
+import six
 import yaml
 
 import turnip.pack.hooks
@@ -156,7 +157,9 @@ def ensure_hooks(repo_root):
     target_name = 'hook.py'
 
     def hook_path(name):
-        return os.path.join(repo_root, 'hooks', name)
+        root = six.ensure_text(repo_root, "utf8")
+        name = six.ensure_text(name, "utf8")
+        return os.path.join(root, 'hooks', name)
 
     if not os.path.exists(hook_path(target_name)):
         need_target = True
diff --git a/turnip/pack/tests/test_git.py b/turnip/pack/tests/test_git.py
index 98ece7c..e5738a4 100644
--- a/turnip/pack/tests/test_git.py
+++ b/turnip/pack/tests/test_git.py
@@ -12,6 +12,7 @@ import os.path
 
 from fixtures import TempDir
 from pygit2 import init_repository
+import six
 from testtools import TestCase
 from testtools.matchers import (
     ContainsDict,
@@ -192,9 +193,10 @@ class TestPackBackendProtocol(TestCase):
         # spawnProcess with appropriate arguments.
         self.proto.requestReceived(
             b'git-upload-pack', b'/foo.git', {b'host': b'example.com'})
+        full_path = os.path.join(six.ensure_binary(self.root), b'foo.git')
         self.assertEqual(
             (b'git',
-             [b'git', b'upload-pack', os.path.join(self.root, b'foo.git')],
+             [b'git', b'upload-pack', full_path],
              {}),
             self.proto.test_process)
 
diff --git a/turnip/pack/tests/test_helpers.py b/turnip/pack/tests/test_helpers.py
index e01406b..a7a3870 100644
--- a/turnip/pack/tests/test_helpers.py
+++ b/turnip/pack/tests/test_helpers.py
@@ -125,7 +125,7 @@ class TestDecodeRequest(TestCase):
         req = b'git-upload-pack /test_repo\0host=git.launchpad.test\0\0'
         self.assertEqual(
             (b'git-upload-pack', b'/test_repo',
-                {b'host': 'git.launchpad.test'}),
+                {b'host': b'git.launchpad.test'}),
             helpers.decode_request(req))
 
     def test_without_parameters(self):
diff --git a/turnip/pack/tests/test_hooks.py b/turnip/pack/tests/test_hooks.py
index 746214e..cc785d8 100644
--- a/turnip/pack/tests/test_hooks.py
+++ b/turnip/pack/tests/test_hooks.py
@@ -283,11 +283,10 @@ class TestPostReceiveHook(HookTestMixin, TestCase):
             default_branch = subprocess.check_output(
                 ['git', 'symbolic-ref', 'HEAD']
                 ).rstrip(b'\n')
-            pushed_branch = str(default_branch + 'notdefault')
-            yield self.assertMergeProposalURLReceived([(
-                b'%s' % pushed_branch,
-                self.old_sha1, self.new_sha1)],
-                {b'%s' % pushed_branch: ['push']})
+            pushed_branch = default_branch + b'notdefault'
+            yield self.assertMergeProposalURLReceived(
+                [(pushed_branch, self.old_sha1, self.new_sha1)],
+                {pushed_branch: ['push']})
         finally:
             os.chdir(curdir)