From 0b1d92a014b45fef918c26203a9ae99f45252bf3 2009-07-01 23:12:15 From: Brian Granger Date: 2009-07-01 23:12:15 Subject: [PATCH] ConfigLoader.py => config/configloader.py and updated all imports. --- diff --git a/IPython/ConfigLoader.py b/IPython/config/configloader.py similarity index 100% rename from IPython/ConfigLoader.py rename to IPython/config/configloader.py diff --git a/IPython/config/tests/test_imports.py b/IPython/config/tests/test_imports.py new file mode 100644 index 0000000..58f8218 --- /dev/null +++ b/IPython/config/tests/test_imports.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python +# encoding: utf-8 + +def test_import_configloader(): + from IPython.config import configloader + diff --git a/IPython/ipmaker.py b/IPython/ipmaker.py index f514338..b2d896d 100644 --- a/IPython/ipmaker.py +++ b/IPython/ipmaker.py @@ -40,17 +40,15 @@ except NameError: import __main__ import __builtin__ import os -import re import sys -import types -from pprint import pprint,pformat +from pprint import pprint # Our own from IPython import DPyGetOpt from IPython import Release from IPython.ipstruct import Struct from IPython.OutputTrap import OutputTrap -from IPython.ConfigLoader import ConfigLoader +from IPython.config.configloader import ConfigLoader from IPython.iplib import InteractiveShell from IPython.usage import cmd_line_usage,interactive_usage from IPython.genutils import * diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py index 413aaec..4f2c81d 100644 --- a/IPython/testing/iptest.py +++ b/IPython/testing/iptest.py @@ -198,7 +198,7 @@ def make_runners(): # XXX: Shell.py is also ommited because of a bug in the skip_doctest # decorator. See ticket https://bugs.launchpad.net/bugs/366209 top_mod = \ - ['backgroundjobs.py', 'coloransi.py', 'completer.py', 'ConfigLoader.py', + ['backgroundjobs.py', 'coloransi.py', 'completer.py', 'configloader.py', 'CrashHandler.py', 'Debugger.py', 'deep_reload.py', 'demo.py', 'DPyGetOpt.py', 'dtutils.py', 'excolors.py', 'FakeModule.py', 'generics.py', 'genutils.py', 'history.py', 'hooks.py', 'ipapi.py',