upgrade_dir.py => utils/upgradedir.py and updated imports.

IPython/core/magic.py

@@ -3351,7 +3351,7 b' Defaulting color scheme to \'NoColor\'"""'
         """
         ip = self.getapi()
         ipinstallation = path(IPython.__file__).dirname()
-        upgrade_script = '%s "%s"' % (sys.executable,ipinstallation / 'upgrade_dir.py')
+        upgrade_script = '%s "%s"' % (sys.executable,ipinstallation / 'utils' / 'upgradedir.py')
         src_config = ipinstallation / 'UserConfig'
         userdir = path(ip.options.ipythondir)
         cmd = '%s "%s" "%s"' % (upgrade_script, src_config, userdir)

IPython/testing/iptest.py

@@ -207,7 +207,7 b' def make_runners():'
        'outputtrap.py', 'platutils.py', 'prefilter.py', 'prompts.py',
        'PyColorize.py', 'release.py', 'rlineimpl.py', 'shadowns.py',
        'shellglobals.py', 'strdispatch.py', 'twshell.py',
-       'ultratb.py', 'upgrade_dir.py', 'usage.py', 'wildcard.py',
+       'ultratb.py', 'upgradedir.py', 'usage.py', 'wildcard.py',
        # See note above for why this is skipped
        # 'shell.py',
        'winconsole.py']

IPython/utils/tests/test_imports.py

@@ -27,3 +27,6 b' def test_import_rlineimpl():'
 
 def test_import_strdispatch():
     from IPython.utils import strdispatch
+
+def test_import_upgradedir():
+    from IPython.utils import upgradedir