From 5a080db171bd42a2898c2264cc83ce2a562c448b 2009-09-15 05:54:31
From: Brian Granger <ellisonbg@gmail.com>
Date: 2009-09-15 05:54:31
Subject: [PATCH] Changed how config files are loaded.

Previously, we were loading a config file by exec'ing the file in 
an empty Config instance.  That was a bit dangerous, so now there
is a get_config function that should be called to get the Config
instance.  Then attributes can simply be set on it.  

The config files have been updated to reflect this change.

---

diff --git a/IPython/config/default/ipython_config.py b/IPython/config/default/ipython_config.py
index 875f5f8..0047d2e 100644
--- a/IPython/config/default/ipython_config.py
+++ b/IPython/config/default/ipython_config.py
@@ -1,29 +1,32 @@
+# Get the config being loaded so we can set attributes on it
+c = get_config()
+
 #-----------------------------------------------------------------------------
 # Global options
 #-----------------------------------------------------------------------------
 
-# Global.display_banner = True
+# c.Global.display_banner = True
 
-# Global.classic = False
+# c.Global.classic = False
 
-# Global.nosep = True
+# c.Global.nosep = True
 
 # Set this to determine the detail of what is logged at startup.
 # The default is 30 and possible values are 0,10,20,30,40,50.
-# Global.log_level = 30
+c.Global.log_level = 20
 
 # This should be a list of importable Python modules that have an
 # load_in_ipython(ip) method.  This method gets called when the extension
 # is loaded.  You can put your extensions anywhere they can be imported
 # but we add the extensions subdir of the ipython directory to sys.path
 # during extension loading, so you can put them there as well.
-# Global.extensions = [
+# c.Global.extensions = [
 #     'myextension'
 # ]
 
 # These lines are run in IPython in the user's namespace after extensions 
 # are loaded.  They can contain full IPython syntax with magics etc.
-# Global.exec_lines = [
+# c.Global.exec_lines = [
 #     'import numpy',
 #     'a = 10; b = 20',
 #     '1/0'
@@ -33,7 +36,7 @@
 # extension need to be pure Python.  Files with a .ipy extension can have
 # custom IPython syntax (like magics, etc.).  
 # These files need to be in the cwd, the ipythondir or be absolute paths.
-# Global.exec_files = [
+# c.Global.exec_files = [
 #     'mycode.py',
 #     'fancy.ipy'
 # ]
@@ -42,56 +45,55 @@
 # InteractiveShell options
 #-----------------------------------------------------------------------------
 
+# c.InteractiveShell.autocall = 1
 
-# InteractiveShell.autocall = 1
-
-# InteractiveShell.autoedit_syntax = False
+# c.InteractiveShell.autoedit_syntax = False
 
-# InteractiveShell.autoindent = True
+# c.InteractiveShell.autoindent = True
 
-# InteractiveShell.automagic = False
+# c.InteractiveShell.automagic = False
 
-# InteractiveShell.banner1 = 'This if for overriding the default IPython banner'
+# c.InteractiveShell.banner1 = 'This if for overriding the default IPython banner'
  
-# InteractiveShell.banner2 = "This is for extra banner text"
+# c.InteractiveShell.banner2 = "This is for extra banner text"
 
-# InteractiveShell.cache_size = 1000
+# c.InteractiveShell.cache_size = 1000
 
-# InteractiveShell.colors = 'LightBG'
+# c.InteractiveShell.colors = 'LightBG'
 
-# InteractiveShell.color_info = True
+# c.InteractiveShell.color_info = True
 
-# InteractiveShell.confirm_exit = True
+# c.InteractiveShell.confirm_exit = True
 
-# InteractiveShell.deep_reload = False
+# c.InteractiveShell.deep_reload = False
 
-# InteractiveShell.editor = 'nano'
+# c.InteractiveShell.editor = 'nano'
 
-# InteractiveShell.logstart = True
+# c.InteractiveShell.logstart = True
 
-# InteractiveShell.logfile = 'ipython_log.py'
+# c.InteractiveShell.logfile = 'ipython_log.py'
 
-# InteractiveShell.logplay = 'mylog.py'
+# c.InteractiveShell.logplay = 'mylog.py'
 
-# InteractiveShell.object_info_string_level = 0
+# c.InteractiveShell.object_info_string_level = 0
 
-# InteractiveShell.pager = 'less'
+# c.InteractiveShell.pager = 'less'
 
-# InteractiveShell.pdb = False
+# c.InteractiveShell.pdb = False
 
-# InteractiveShell.pprint = True
+# c.InteractiveShell.pprint = True
 
-# InteractiveShell.prompt_in1 = 'In [\#]: '
-# InteractiveShell.prompt_in2 = '   .\D.: '
-# InteractiveShell.prompt_out = 'Out[\#]: '
-# InteractiveShell.prompts_pad_left = True
+# c.InteractiveShell.prompt_in1 = 'In [\#]: '
+# c.InteractiveShell.prompt_in2 = '   .\D.: '
+# c.InteractiveShell.prompt_out = 'Out[\#]: '
+# c.InteractiveShell.prompts_pad_left = True
 
-# InteractiveShell.quiet = False
+# c.InteractiveShell.quiet = False
 
 # Readline 
-# InteractiveShell.readline_use = True
+# c.InteractiveShell.readline_use = True
 
-# InteractiveShell.readline_parse_and_bind = [
+# c.InteractiveShell.readline_parse_and_bind = [
 #     'tab: complete',
 #     '"\C-l": possible-completions',
 #     'set show-all-if-ambiguous on',
@@ -108,39 +110,39 @@
 #     '"\C-k": kill-line',
 #     '"\C-u": unix-line-discard',
 # ]
-# InteractiveShell.readline_remove_delims = '-/~'
-# InteractiveShell.readline_merge_completions = True
-# InteractiveShell.readline_omit_names = 0
+# c.InteractiveShell.readline_remove_delims = '-/~'
+# c.InteractiveShell.readline_merge_completions = True
+# c.InteractiveShell.readline_omit_names = 0
 
-# InteractiveShell.screen_length = 0
+# c.InteractiveShell.screen_length = 0
 
-# InteractiveShell.separate_in = '\n'
-# InteractiveShell.separate_out = ''
-# InteractiveShell.separate_out2 = ''
+# c.InteractiveShell.separate_in = '\n'
+# c.InteractiveShell.separate_out = ''
+# c.InteractiveShell.separate_out2 = ''
 
-# InteractiveShell.system_header = "IPython system call: "
+# c.InteractiveShell.system_header = "IPython system call: "
 
-# InteractiveShell.system_verbose = True
+# c.InteractiveShell.system_verbose = True
 
-# InteractiveShell.term_title = False
+# c.InteractiveShell.term_title = False
 
-# InteractiveShell.wildcards_case_sensitive = True
+# c.InteractiveShell.wildcards_case_sensitive = True
 
-# InteractiveShell.xmode = 'Context'
+# c.InteractiveShell.xmode = 'Context'
 
 #-----------------------------------------------------------------------------
 # PrefilterManager options
 #-----------------------------------------------------------------------------
 
-# PrefilterManager.multi_line_specials = True
+# c.PrefilterManager.multi_line_specials = True
 
 #-----------------------------------------------------------------------------
 # AliasManager options
 #-----------------------------------------------------------------------------
 
 # Do this to enable all defaults
-# AliasManager.default_aliases = []
+# c.AliasManager.default_aliases = []
 
-# AliasManager.user_aliases = [
-    # ('foo', 'echo Hi')
+# c.AliasManager.user_aliases = [
+#     ('foo', 'echo Hi')
 # ]
\ No newline at end of file
diff --git a/IPython/config/loader.py b/IPython/config/loader.py
index ea3a5b7..3ba69a8 100644
--- a/IPython/config/loader.py
+++ b/IPython/config/loader.py
@@ -247,12 +247,13 @@ class PyFileConfigLoader(FileConfigLoader):
             sub_config = loader.load_config()
             self.config._merge(sub_config)
 
-        self.config.load_subconfig = load_subconfig
-        try:
-            execfile(self.full_filename, self.config)
-        finally:
-            del self.config.load_subconfig
-            del self.config['__builtins__']
+        # Again, this needs to be a closure and should be used in config
+        # files to get the config being loaded.
+        def get_config():
+            return self.config
+
+        namespace = dict(load_subconfig=load_subconfig, get_config=get_config)
+        execfile(self.full_filename, namespace)
 
     def _convert_to_config(self):
         if self.data is None:
diff --git a/IPython/config/profile/ipython_config_math.py b/IPython/config/profile/ipython_config_math.py
index 0dad772..49a0933 100644
--- a/IPython/config/profile/ipython_config_math.py
+++ b/IPython/config/profile/ipython_config_math.py
@@ -1,3 +1,5 @@
+c = get_config()
+
 # This can be used at any point in a config file to load a sub config
 # and merge it into the current one.
 load_subconfig('ipython_config.py')
@@ -10,8 +12,8 @@ from math import *
 # You have to make sure that attributes that are containers already
 # exist before using them.  Simple assigning a new list will override
 # all previous values.
-if hasattr(Global, 'exec_lines'):
-    Global.exec_lines.append(lines)
+if hasattr(c.Global, 'exec_lines'):
+    c.Global.exec_lines.append(lines)
 else:
-    Global.exec_lines = [lines]
+    c.Global.exec_lines = [lines]
 
diff --git a/IPython/config/profile/ipython_config_numeric.py b/IPython/config/profile/ipython_config_numeric.py
index 5660e5a..9f7afa8 100644
--- a/IPython/config/profile/ipython_config_numeric.py
+++ b/IPython/config/profile/ipython_config_numeric.py
@@ -1,3 +1,5 @@
+c = get_config()
+
 # This can be used at any point in a config file to load a sub config
 # and merge it into the current one.
 load_subconfig('ipython_config.py')
@@ -12,7 +14,7 @@ import scipy as sp
 # You have to make sure that attributes that are containers already
 # exist before using them.  Simple assigning a new list will override
 # all previous values.
-if hasattr(Global, 'exec_lines'):
-    Global.exec_lines.append(lines)
+if hasattr(c.Global, 'exec_lines'):
+    c.Global.exec_lines.append(lines)
 else:
-    Global.exec_lines = [lines]
\ No newline at end of file
+    c.Global.exec_lines = [lines]
\ No newline at end of file
diff --git a/IPython/config/profile/ipython_config_pylab.py b/IPython/config/profile/ipython_config_pylab.py
index 5a39a82..9885ac7 100644
--- a/IPython/config/profile/ipython_config_pylab.py
+++ b/IPython/config/profile/ipython_config_pylab.py
@@ -1,3 +1,5 @@
+c = get_config()
+
 # This can be used at any point in a config file to load a sub config
 # and merge it into the current one.
 load_subconfig('ipython_config.py')
@@ -14,7 +16,7 @@ from matplotlib.pyplot import *
 # You have to make sure that attributes that are containers already
 # exist before using them.  Simple assigning a new list will override
 # all previous values.
-if hasattr(Global, 'exec_lines'):
-    Global.exec_lines.append(lines)
+if hasattr(c.Global, 'exec_lines'):
+    c.Global.exec_lines.append(lines)
 else:
-    Global.exec_lines = [lines]
\ No newline at end of file
+    c.Global.exec_lines = [lines]
\ No newline at end of file
diff --git a/IPython/config/profile/ipython_config_pysh.py b/IPython/config/profile/ipython_config_pysh.py
index 986fec3..ba20354 100644
--- a/IPython/config/profile/ipython_config_pysh.py
+++ b/IPython/config/profile/ipython_config_pysh.py
@@ -1,18 +1,20 @@
+c = get_config()
+
 # This can be used at any point in a config file to load a sub config
 # and merge it into the current one.
 load_subconfig('ipython_config.py')
 
-InteractiveShell.prompt_in1 = '\C_LightGreen\u@\h\C_LightBlue[\C_LightCyan\Y1\C_LightBlue]\C_Green|\#> '
-InteractiveShell.prompt_in2 = '\C_Green|\C_LightGreen\D\C_Green> '
-InteractiveShell.prompt_out = '<\#> '
+c.InteractiveShell.prompt_in1 = '\C_LightGreen\u@\h\C_LightBlue[\C_LightCyan\Y1\C_LightBlue]\C_Green|\#> '
+c.InteractiveShell.prompt_in2 = '\C_Green|\C_LightGreen\D\C_Green> '
+c.InteractiveShell.prompt_out = '<\#> '
 
-InteractiveShell.prompts_pad_left = True
+c.InteractiveShell.prompts_pad_left = True
 
-InteractiveShell.separate_in = ''
-InteractiveShell.separate_out = ''
-InteractiveShell.separate_out2 = ''
+c.InteractiveShell.separate_in = ''
+c.InteractiveShell.separate_out = ''
+c.InteractiveShell.separate_out2 = ''
 
-PrefilterManager.multi_line_specials = True
+c.PrefilterManager.multi_line_specials = True
 
 lines = """
 %rehashx
@@ -21,7 +23,7 @@ lines = """
 # You have to make sure that attributes that are containers already
 # exist before using them.  Simple assigning a new list will override
 # all previous values.
-if hasattr(Global, 'exec_lines'):
-    Global.exec_lines.append(lines)
+if hasattr(c.Global, 'exec_lines'):
+    c.Global.exec_lines.append(lines)
 else:
-    Global.exec_lines = [lines]
\ No newline at end of file
+    c.Global.exec_lines = [lines]
\ No newline at end of file
diff --git a/IPython/config/profile/ipython_config_sympy.py b/IPython/config/profile/ipython_config_sympy.py
index f9dedb8..a32b522 100644
--- a/IPython/config/profile/ipython_config_sympy.py
+++ b/IPython/config/profile/ipython_config_sympy.py
@@ -1,3 +1,5 @@
+c = get_config()
+
 # This can be used at any point in a config file to load a sub config
 # and merge it into the current one.
 load_subconfig('ipython_config.py')
@@ -13,7 +15,7 @@ f, g, h = map(Function, 'fgh')
 # You have to make sure that attributes that are containers already
 # exist before using them.  Simple assigning a new list will override
 # all previous values.
-if hasattr(Global, 'exec_lines'):
-    Global.exec_lines.append(lines)
+if hasattr(c.Global, 'exec_lines'):
+    c.Global.exec_lines.append(lines)
 else:
-    Global.exec_lines = [lines]
+    c.Global.exec_lines = [lines]