diff options
Diffstat (limited to 'contrib/python/ipython/py3/IPython')
| -rw-r--r-- | contrib/python/ipython/py3/IPython/core/application.py | 5 | ||||
| -rw-r--r-- | contrib/python/ipython/py3/IPython/core/release.py | 2 | ||||
| -rw-r--r-- | contrib/python/ipython/py3/IPython/utils/_sysinfo.py | 2 |
3 files changed, 5 insertions, 4 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 = [ diff --git a/contrib/python/ipython/py3/IPython/core/release.py b/contrib/python/ipython/py3/IPython/core/release.py index 11f7cb31694..06d733a2a2a 100644 --- a/contrib/python/ipython/py3/IPython/core/release.py +++ b/contrib/python/ipython/py3/IPython/core/release.py @@ -16,7 +16,7 @@ # release. 'dev' as a _version_extra string means this is a development # version _version_major = 8 -_version_minor = 38 +_version_minor = 39 _version_patch = 0 _version_extra = ".dev" # _version_extra = "rc1" diff --git a/contrib/python/ipython/py3/IPython/utils/_sysinfo.py b/contrib/python/ipython/py3/IPython/utils/_sysinfo.py index cd18a50469a..e14ae332f31 100644 --- a/contrib/python/ipython/py3/IPython/utils/_sysinfo.py +++ b/contrib/python/ipython/py3/IPython/utils/_sysinfo.py @@ -1,2 +1,2 @@ # GENERATED BY setup.py -commit = "f014fa10d" +commit = "8f440a21d" |