From 7238ac5365f99aa83b453d421248ccc1cc5d5660 Mon Sep 17 00:00:00 2001 From: Tim van Katwijk Date: Wed, 30 Nov 2022 22:39:42 +0100 Subject: [PATCH] make python 2 3 compatible --- dockerfile_parse/parser.py | 2 +- dockerfile_parse/util.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dockerfile_parse/parser.py b/dockerfile_parse/parser.py index 07ce585..a6d0c5d 100644 --- a/dockerfile_parse/parser.py +++ b/dockerfile_parse/parser.py @@ -359,7 +359,7 @@ def parent_images(self): in_stage = True image, _ = image_from(instr['value']) if image is not None: - image = WordSplitter(image, args=top_args).dequote() + image = WordSplitter(image.to_str(), args=top_args).dequote() parents.append(image) return parents diff --git a/dockerfile_parse/util.py b/dockerfile_parse/util.py index 256d64a..820c65c 100644 --- a/dockerfile_parse/util.py +++ b/dockerfile_parse/util.py @@ -54,7 +54,7 @@ def __init__(self, s, args=None, envs=None): :param envs: dict, environment variables to use; if None, do not attempt substitution """ - self.stream = StringIO(b2u(str(s))) + self.stream = StringIO(s) self.args = args self.envs = envs