Permalink
Commits on Oct 10, 2012
  1. gevent inputhook

    committed Oct 10, 2012
Commits on Oct 7, 2012
  1. @bfroehle

    Merge pull request #2469 from avandever/master

    Treat `__init__.pyc` same as `__init__.py` in module_list
    bfroehle committed Oct 7, 2012
  2. @bfroehle

    Merge pull request #2165 from tkf/run-glob

    Expand globs (i.e., '*' and '?') in `%run`.  Use `-G` to skip.
    bfroehle committed Oct 7, 2012
Commits on Oct 5, 2012
  1. @avandever

    Merge branch 'master' of https://github.com/avandever/ipython

    Conflicts:
    	IPython/core/completerlib.py
    avandever committed Oct 5, 2012
  2. @avandever

    Treat __init__.pyc same as __init__.py in module_list

    There are some circumstances where packages on disk could only have a .pyc
    version of __init__.py. It would be nice if ipython would autocomplete them as
    well. I've been using this in a production environment for several weeks now.
    avandever committed Oct 5, 2012
  3. @avandever

    Treat __init__.pyc same as __init__.py in module_list

    There are some circumstances where packages on disk could only have a .pyc
    version of __init__.py. It would be nice if ipython would autocomplete them as
    well. I've been using this in a production environment for several weeks now.
    avandever committed Oct 5, 2012
Commits on Oct 4, 2012
  1. @minrk

    Merge pull request #2468 from bfroehle/pycache

    Tell git to ignore __pycache__ directories.
    minrk committed Oct 4, 2012
  2. @bfroehle
Commits on Oct 3, 2012
  1. @ellisonbg

    Merge pull request #2421 from Carreau/nbconsole

    Some notebook tweaks.
    ellisonbg committed Oct 3, 2012
  2. @Carreau
Commits on Oct 2, 2012
  1. @ellisonbg

    Merge pull request #2291 from ellisonbg/rmplugin

    Remove old plugin system
    ellisonbg committed Oct 2, 2012
  2. @ellisonbg

    Merge pull request #2127 from Carreau/jsToolbar

    Ability to build toolbar in JS
    ellisonbg committed Oct 2, 2012
Commits on Sep 30, 2012
  1. @Carreau

    Merge branch PR 2445 into master

    Merge "changes for ironpython" from paweljasinski:ironpython.
    
    Merge manualy PR after changing the files mode back to 644.
    Carreau committed Sep 30, 2012
  2. @Carreau

    restore mode 644

    Carreau committed Sep 30, 2012
  3. @Carreau

    Merge pull request #2420 from teegaar/master

    Pass ipython_dir to __init__() method of TerminalInteractiveShell's superclass.
    Carreau committed Sep 30, 2012
  4. @Carreau

    Merge pull request #2432 from bfroehle/revert_1831

    Revert #1831, the `__file__` injection in safe_execfile / safe_execfile_ipy.
    
    This reverts commit 2717feb, reversing changes made to ea4f608.
    
    Pull request #1831 (fix #1814 set __file__ when running .ipy files) has been the source of a lot of grief:
    
    #2279: Setting __file__ to None breaks Mayavi import
    #2429: Using warnings.warn() results in TypeError
    In general the patch was inappropriate because it:
    1. Fails to properly restore the context, by setting __file__ to None rather than deleting it.
    2. Sets __file__ in the wrong dictionary (self.user_ns rather than where[0]).
    Carreau committed Sep 30, 2012
Commits on Sep 29, 2012
  1. @Carreau

    Merge pull request #2216 from Carreau/autohighlight

    Autochange highlight with cell magics
    
    Highlight change is made on cell load and Enter keypress.
    For now, it recognizes %%javascript, %%python[3], %%ruby, %%bash , %%R, %%perl.
    
    new modes can easily be added by adding regular expression on config.js
    Carreau committed Sep 29, 2012
  2. @Carreau

    Merge pull request #1946 from tkf/terminal-image-handler

    Add image message handler in ZMQTerminalInteractiveShell
    
    This change introduces several handlers for messages which contain image in
    ZMQTerminalInteractiveShell. This is useful, for example, when
    connecting to the kernel in which pylab inline backend is activated.
    
    This PR will fix #1575.
    Carreau committed Sep 29, 2012
  3. @Carreau

    Merge pull request #2424 from minrk/fastscript

    skip find_cmd when setting up script magics
    
    find_cmd was slowing down process startup, and probably unnecessary anyway.
    Carreau committed Sep 29, 2012
  4. @Carreau

    Merge pull request #2389 from takluyver/catch-histdb-errors

    Catch sqlite DatabaseErrors in more places when reading the history database
    
    It seems sqlite can encounter corruption and throw an error when reading the database, although it has connected successfully. This borrows the move-and-recreate machinery we already had on connecting to the database.
    
    If such an error occurs, the corrupted file is moved and the user get warned of the name of the corrupted file.
    Carreau committed Sep 29, 2012
  5. @Carreau

    Merge pull request #2395 from minrk/allowimporterror

    Don't catch ImportError when trying to unpack module functions
    Carreau committed Sep 29, 2012
  6. @Carreau

    Merge pull request #1868 from minrk/ipc

    enable IPC transport for kernels
    
    works with the qtconsole
    
    Config is a bit clumsy, because the interpretation of 'ip' is actually a path when transport is IPC.
    
    Notebook does not yet expose the option, because it's still not well integrated into the rest of the config universe.
    Carreau committed Sep 29, 2012
Commits on Sep 28, 2012
  1. @paweljasinski

    changes for ironpython

    paweljasinski committed Sep 28, 2012
  2. @minrk

    Merge pull request #2437 from minrk/cleanlogs

    don't let log cleanup prevent engine start
    
    simply suppresses errors during cleanup, since they shouldn't halt engine startup.
    minrk committed Sep 28, 2012
  3. @takluyver

    Merge pull request #2441 from bfroehle/sys_maxsize

    `sys.maxsize` is the maximum length of a container.
    takluyver committed Sep 28, 2012
  4. @Carreau

    Merge pull request #2442 from minrk/signithalt

    allow iptest to be interrupted
    Carreau committed Sep 28, 2012
Commits on Sep 27, 2012
  1. @minrk

    Merge pull request #2240 from minrk/stranded_metadata

    fix message built for engine dying during task
    
    would result in KeyError on missing 'metadata'
    minrk committed Sep 27, 2012
  2. @minrk

    allow iptest to be interrupted

    Previously `^C` would register as a regular test failure, and the test suite would continue, in which case halting `iptest` meant hitting `^C` nine times.
    
    This change makes iptest take notice of sigint in a test runner, and aborts the run.
    minrk committed Sep 27, 2012
  3. @bfroehle

    `sys.maxsize` is the maximum length of a container.

    From the Python documentation:
    
    > sys.maxsize:
    >   The largest positive integer supported by the platform's
    >   Py_ssize_t type, and thus the maximum size lists, strings,
    >   dicts, and many other containers can have.
    bfroehle committed Sep 27, 2012
  4. @fperez

    Merge pull request #2369 from epatters/block-after-kill

    Block until kernel termination after sending a kill signal.  This will make for more robust kernel restarting in the Qt console.
    fperez committed Sep 27, 2012
  5. @bfroehle

    Merge pull request #2439 from bfroehle/py3k_octal

    2to3: Apply numliterals fix for octals (e.g., 0777 -> 0o777).
    bfroehle committed Sep 27, 2012
  6. @bfroehle

    Py3k: Octal (0777 -> 0o777)

    bfroehle committed Sep 27, 2012
  7. @epatters
  8. @minrk