Merge remote-tracking branch 'origin/master' into typeshed

This commit is contained in:
Dave Halter
2018-12-15 19:05:10 +01:00

View File

@@ -190,8 +190,9 @@ def get_default_environment():
def get_cached_default_environment():
var = os.environ.get('VIRTUAL_ENV')
environment = _get_cached_default_environment()
if environment.path != os.environ.get('VIRTUAL_ENV'):
if var and var != environment.path:
_get_cached_default_environment.clear_cache()
return _get_cached_default_environment()
return environment