Permalink
Switch branches/tags
Commits on Nov 9, 2015
  1. Merge pull request #8962 from sieben/dict_litteral

    minrk committed Nov 9, 2015
    Dict literal
  2. Merge pull request #8961 from sieben/simplify_boolean

    minrk committed Nov 9, 2015
    Simplify boolean expression
  3. Merge pull request #8953 from Carreau/deprecex

    minrk committed Nov 9, 2015
    DeprecationWarning on deprecated colors API
  4. Merge pull request #8960 from sieben/simplify_comparison

    minrk committed Nov 9, 2015
    Simplify comparison
  5. Merge pull request #8958 from sieben/useless_semicolon

    Carreau committed Nov 9, 2015
    Remove useless semicolon
Commits on Nov 8, 2015
  1. Remove useless semicolon

    sieben committed Nov 8, 2015
  2. Dict litteral

    sieben committed Nov 8, 2015
  3. Simplify comparison

    sieben committed Nov 8, 2015
  4. Simplify boolean expression

    sieben committed Nov 8, 2015
Commits on Nov 7, 2015
  1. Merge pull request #8954 from ipython/Carreau-patch-2

    minrk committed Nov 7, 2015
    Update travis to 3.5 (instead of 3.5.0.rc4)
Commits on Nov 4, 2015
  1. Merge pull request #8947 from gonzolabs/highlight

    minrk committed Nov 4, 2015
    Regression: restore syntax highlighting of source in object_info
Commits on Nov 3, 2015
  1. Merge pull request #8945 from minrk/pretty-counter

    Carreau committed Nov 3, 2015
    pretty: don't hardcode names for counter/deque/etc subclasses
  2. pretty: don't hardcode names for counter/deque/etc subclasses

    minrk committed Nov 3, 2015
    ask for `obj.__class__.__name__`
  3. Merge pull request #8933 from minrk/test-inline-twice

    minrk committed Nov 3, 2015
    fix instantiation of shell in test_inline_twice
Commits on Nov 2, 2015
  1. Merge pull request #8943 from vincent-legoll/master

    minrk committed Nov 2, 2015
    Fix small text glitches in examples
  2. Fix small text glitches

    vincent-legoll committed Nov 2, 2015
    missing 'd' char in 'rendered'
    fix '...' punctuation
    
    Signed-off-by: Vincent Legoll <vincent.legoll@idgrilles.fr>
Commits on Oct 28, 2015
  1. fix instantiation of shell in test_inline_twice

    minrk committed Oct 28, 2015
    test was failing because get_ipython() returns an instance where inline backend doesn't make sense.
Commits on Oct 27, 2015
  1. Merge pull request #8929 from jakirkham/fix_resource_warning_devnull

    minrk committed Oct 27, 2015
    BUGFIX: Close `devnull`at exit to avoid a `ResourceWarning` (Python 3)
  2. IPython/utils/io.py: Make sure `devnull` is closed at exit to avoid a…

    jakirkham committed Oct 27, 2015
    … `ResourceWarning` being raised by Python 3.
Commits on Oct 26, 2015
  1. Merge pull request #8926 from minrk/check-readline

    Carreau committed Oct 26, 2015
    restore check for readline
  2. restore check for readline

    minrk committed Oct 26, 2015
    fix regression in debugger exit for non-readline contexts
  3. Merge pull request #8908 from Fairly:master

    minrk committed Oct 26, 2015
    set nonzero exit status when running script fails
    
    closes #8908
  4. Set exit code on script errors.

    Fairly committed with minrk Oct 13, 2015
    Only handle the issue related to .py scripts.
    
    1. interactiveshell: The method safe_execfile is not totally safe now. Errors of user scripts  are raised to a higher level, where we can decide what to do.
    
    2. execution: The %run magic catches exceptions from safe_execfile.
    
    3. shellapp: The _run_cmd_line_code method catches exceptions from safe_execfile and sets the right exit status.
    
    Partial-revert:
    
    1. Change execution.py back.
    
    2. Revert some changes in safe_execfile, then modify the excetion
    handling logic.
Commits on Oct 25, 2015
  1. Merge pull request #8920 from JanSchulz/dontresetformatter

    minrk committed Oct 25, 2015
    Prevent reset of matplotlib formatters when enabled again
  2. Prevent reset of matplotlib formatters when enabled again

    janschulz committed Oct 21, 2015
    Calling `%matplotlib inline` again will reset the formatter
    (enable png/...). This is not ok, because the user might have
    disabled some formatting.
    
    Closes: ipython/ipykernel#29
  3. Merge pull request #8925 from Naereen/patch-1

    Carreau committed Oct 25, 2015
    For timeit magic, no s at "loops" if only one loop
  4. For timeit magic, no s at "loops" if only one loop

    Naereen committed Oct 25, 2015
    Just a grammatical correction: no s at "loops" if there is only one loop.
    It affects the %timeit magic, its doc, and the message about "an intermediate result being cached".
Commits on Oct 20, 2015
  1. Merge pull request #8916 from wbolster/add-whitespace-placeholder-for…

    minrk committed Oct 20, 2015
    …-interactive-prompts
    
    Add \S prompt char for whitespace as wide as the count (similar to \D)
Commits on Oct 19, 2015
Commits on Oct 15, 2015
  1. Merge pull request #8909 from xconverge/master

    minrk committed Oct 15, 2015
    Don't hardcode "python" executable in docs/Makefile
    
    closes #8857
Commits on Oct 14, 2015
  1. Merge pull request #8843 from minrk/coding-cell-magic

    Carreau committed Oct 14, 2015
    don't strip encoding cookie from cell magics