##// END OF EJS Templates
Merge branch 'glut-rebased' of git://github.com/fperez/ipython into glut...
Merge branch 'glut-rebased' of git://github.com/fperez/ipython into glut * 'glut-rebased' of git://github.com/fperez/ipython: Added the command line option Fix code in disable_glut which was not tested and quite buggy Tried to fix the CTRL-C problem (https://github.com/ipython/ipython/pull/742) and take other comments/typos into account Replaced deprecated raise call Fixed typos in comments Canceled window reshape to 1x1 since the idea is now for the user to use this window as the main one because of weird seg-faults problem after user creates its own window (any subsequent gl error would lead to a segfault, even a simple one line requiring a non existent function Event loop integration example Added code for the GLUT interactive session

File last commit:

r4030:c335e497
r4818:89161a5b merge
Show More
ipython_config.py
25 lines | 713 B | text/x-python | PythonLexer
MinRK
reorganize default config files to match profiles as directories...
r3954 c = get_config()
MinRK
load_subconfig supports profiles...
r4030 app = c.InteractiveShellApp
MinRK
reorganize default config files to match profiles as directories...
r3954
# This can be used at any point in a config file to load a sub config
# and merge it into the current one.
MinRK
load_subconfig supports profiles...
r4030 load_subconfig('ipython_config.py', profile='default')
MinRK
reorganize default config files to match profiles as directories...
r3954
lines = """
MinRK
remove old default config files
r3965 from IPython.parallel import *
MinRK
reorganize default config files to match profiles as directories...
r3954 """
# 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.
MinRK
remove old default config files
r3965 if hasattr(app, 'exec_lines'):
app.exec_lines.append(lines)
MinRK
reorganize default config files to match profiles as directories...
r3954 else:
MinRK
remove old default config files
r3965 app.exec_lines = [lines]
MinRK
reorganize default config files to match profiles as directories...
r3954
# Load the parallelmagic extension to enable %result, %px, %autopx magics.
MinRK
remove old default config files
r3965 if hasattr(app, 'extensions'):
app.extensions.append('parallelmagic')
MinRK
reorganize default config files to match profiles as directories...
r3954 else:
MinRK
remove old default config files
r3965 app.extensions = ['parallelmagic']
MinRK
reorganize default config files to match profiles as directories...
r3954