summaryrefslogtreecommitdiffstats
path: root/contrib/python/ipython/py3/IPython/core/application.py
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/python/ipython/py3/IPython/core/application.py')
-rw-r--r--contrib/python/ipython/py3/IPython/core/application.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/python/ipython/py3/IPython/core/application.py b/contrib/python/ipython/py3/IPython/core/application.py
index 841e867a747..2cc4bbdf915 100644
--- a/contrib/python/ipython/py3/IPython/core/application.py
+++ b/contrib/python/ipython/py3/IPython/core/application.py
@@ -33,10 +33,11 @@ from traitlets import (
)
if os.name == "nt":
+ # %PROGRAMDATA% is not safe by default, require opt-in to trust it
programdata = os.environ.get("PROGRAMDATA", None)
- if programdata is not None:
+ if os.environ.get("IPYTHON_USE_PROGRAMDATA") == "1" and programdata is not None:
SYSTEM_CONFIG_DIRS = [str(Path(programdata) / "ipython")]
- else: # PROGRAMDATA is not defined by default on XP.
+ else:
SYSTEM_CONFIG_DIRS = []
else:
SYSTEM_CONFIG_DIRS = [