From 5e4146cb5871b4f989c437a4460c5446cc44851c Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Fri, 28 Jun 2019 20:47:36 +0000 Subject: [PATCH] Fixed a bytes/str issue in a patch library call. - Legacy-Id: 16326 --- ietf/checks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ietf/checks.py b/ietf/checks.py index ae8e3b611..f4d6e2e9a 100644 --- a/ietf/checks.py +++ b/ietf/checks.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2015-2019, All Rights Reserved import os import patch import sys @@ -367,7 +368,7 @@ def maybe_patch_library(app_configs, **kwargs): patch_path = os.path.join(cwd, patch_file) patch_set = patch.fromfile(patch_path) if patch_set: - if not patch_set.apply(root=library_path): + if not patch_set.apply(root=library_path.encode('utf-8')): errors.append(checks.Warning( "Could not apply patch from file '%s'"%patch_file, hint=("Make sure that the patch file contains a unified diff and has valid file paths\n\n"