Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #565 from ivanov/dont-move-old-config

old config files are not moved
a warning will be repeated until explicitly suppressed or files moved.
  • Loading branch information...
commit 240dd6097cc3e24209177b3e66bdee1c317cacc8 2 parents 1bd07ab + 24d6c36
@minrk minrk authored
Showing with 3 additions and 9 deletions.
  1. +3 −9 IPython/utils/path.py
View
12 IPython/utils/path.py
@@ -434,13 +434,7 @@ def check_for_old_config(ipython_dir=None):
if filehash(f) == old_config_md5.get(cfg, ''):
os.unlink(f)
else:
- oldf = f+'.old'
- i = 0
- while os.path.exists(oldf):
- oldf = f+'.old.%i'%i
- i += 1
- os.rename(f, oldf)
- warn.warn("Renamed old IPython config file '%s' to '%s'." % (f, oldf))
+ warn.warn("Found old IPython config file %r (modified by user)"%f)
warned = True
if warned:
@@ -451,6 +445,6 @@ def check_for_old_config(ipython_dir=None):
To start configuring IPython, do `ipython profile create`, and edit
`ipython_config.py` in <ipython_dir>/profile_default.
If you need to leave the old config files in place for an older version of
- IPython, set `c.InteractiveShellApp.ignore_old_config=True` in the new config.""")
-
+ IPython and want to suppress this warning message, set
+ `c.InteractiveShellApp.ignore_old_config=True` in the new config.""")
Please sign in to comment.
Something went wrong with that request. Please try again.