From d2342775db235ee2bca31af28821d3d0a54f994d Mon Sep 17 00:00:00 2001 From: Jeff Tratner Date: Sat, 24 Mar 2018 16:54:25 -0700 Subject: [PATCH] Fix envrionment variable expansion on str types Upstreaming of pypa/pipenv#1809: "Fix environment variable expansion with extras" --- pipfile/api.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pipfile/api.py b/pipfile/api.py index b73ac70..1bde35f 100644 --- a/pipfile/api.py +++ b/pipfile/api.py @@ -4,6 +4,7 @@ import json import hashlib import platform +import six import sys import os @@ -38,9 +39,10 @@ def inject_environment_variables(self, d): if not d: return d - + if isinstance(d, six.string_types): + return os.path.expandvars(d) for k, v in d.items(): - if isinstance(v, str): + if isinstance(v, six.string_types): d[k] = os.path.expandvars(v) elif isinstance(v, dict): d[k] = self.inject_environment_variables(v)