From abec6f58910f5d670493ce23e2de14de286ba248 Mon Sep 17 00:00:00 2001
From: jrabbit <jackjrabbit@gmail.com>
Date: Sat, 6 Feb 2016 02:54:06 -0500
Subject: [PATCH] Change special case from '_', None to ()
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
---
compose/config/config.py | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/compose/config/config.py b/compose/config/config.py
index a42f11a60..27f5ff6a2 100644
--- a/compose/config/config.py
+++ b/compose/config/config.py
@@ -491,18 +491,12 @@ def resolve_environment(service_dict):
env.update(env_vars_from_file(env_file))
env.update(parse_environment(service_dict.get('environment')))
- d = dict(resolve_env_var(k, v) for k, v in six.iteritems(env))
- if '_' in d.keys():
- del d['_']
- return d
+ return dict(filter(None, (resolve_env_var(k, v) for k, v in six.iteritems(env))))
def resolve_build_args(build):
args = parse_build_arguments(build.get('args'))
- d = dict(resolve_env_var(k, v) for k, v in six.iteritems(args))
- if '_' in d.keys():
- del d['_']
- return d
+ return dict(filter(None, (resolve_env_var(k, v) for k, v in six.iteritems(args))))
def validate_extended_service_dict(service_dict, filename, service):
@@ -812,7 +806,7 @@ def resolve_env_var(key, val):
elif key in os.environ:
return key, os.environ[key]
else:
- return "_", None
+ return ()
def env_vars_from_file(filename):