Commit message Age Author Refs
r2157:8bb438f1
First prototype of component, traitlets and a config loader.
Brian Granger
0
r2156:ed44a843
Merging upstream change from module-reorg branch. Recently lp:ipython was merged into module-reorg. This is propagating that merge into this inputhook branch.
Brian Granger
0
r2155:d4c354b2
Merging -r 1201 from lp:ipython. This concludes the upstream merge of trunk into the module-reorg branch.
Brian Granger
0
r2154:a02653fa
Merging -r 1200 from lp:ipython.
Brian Granger
0
r2153:f0163de9
Merging -r 1199 from lp:ipython.
Brian Granger
0
r2152:e6fe2e2c
Merging -r 1198 from lp:ipython.
Brian Granger
0
r2151:416fad6f
Merging -r 1197 from lp:ipython.
Brian Granger
0
r2150:b44b6920
Merging -r 1196 from lp:ipython. A couple of issues came up: * Some tests in testing and frontend rely on twisted, but are being tested with nose. This is bad! We currently have hackish logic in iptest to skip these if twisted is not installed, but if it is we are testing them with nose! * Some modules (engineservice, kernel/error, newserialized) have nose skip logic even though they should never be tested with nose. * When trial is run on testStrictDict we get an uncaught error. testStrictDict ... ERROR: An unexpected error occurred while tokenizing input The following traceback may be corrupted or invalid The error message is: ('EOF in multi-line statement', (37, 0))
Brian Granger
0
r2149:111bc948
Merging -r 1195 from lp:ipython.x
Brian Granger
0
r2148:b7c07ecf
Merging -r 1194 from lp:ipython.
Brian Granger
0
< 1 .. 2659 2660 2661 2662 2663 .. 2876 >