Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -7,6 +7,9 b' python:'
     - 3.4
     - 3.3
 sudo: false
+env:
+  global:
+    - PATH=$TRAVIS_BUILD_DIR/pandoc:$PATH
 group: edge
 before_install:
     - 'if [[ $GROUP != js* ]]; then COVERAGE=""; fi'
@@ -14,8 +17,15 b' install:'
     - pip install setuptools pip --upgrade
     - pip install -e file://$PWD#egg=ipython[test] --upgrade
     - pip install codecov --upgrade
+    - sudo apt-get install graphviz
 script:
     - cd /tmp && iptest --coverage xml && cd -
+    # On the latest Python only, make sure that the docs build.
+    - |
+      if [[ "$TRAVIS_PYTHON_VERSION" == "3.6" ]]; then
+        pip install -r docs/requirements.txt
+        make -C docs/ html SPHINXOPTS="-W"
+      fi
 after_success:
     - cp /tmp/ipy_coverage.xml ./
     - cp /tmp/.coverage ./

IPython/core/completer.py

@@ -360,7 +360,7 b' class Completion:'
     need user facing information.
 
     - Which range should be replaced replaced by what.
-    - Some metadata (like completion type), or meta informations to displayed to
+    - Some metadata (like completion type), or meta information to displayed to
       the use user.
 
     For debugging purpose we can also store the origin of the completion (``jedi``,
@@ -1873,7 +1873,7 b' class IPCompleter(Completer):'
         start_offset = before.rfind(matched_text)
 
         # TODO:
-        # Supress this, right now just for debug.
+        # Suppress this, right now just for debug.
         if jedi_matches and matches and self.debug:
             yield Completion(start=start_offset, end=offset, text='--jedi/ipython--',
                              _origin='debug', type='none', signature='')

IPython/core/debugger.py

@@ -32,6 +32,7 b' import inspect'
 import linecache
 import sys
 import warnings
+import re
 
 from IPython import get_ipython
 from IPython.utils import PyColorize
@@ -175,6 +176,13 b' class Tracer(object):'
         self.debugger.set_trace(sys._getframe().f_back)
 
 
+RGX_EXTRA_INDENT = re.compile('(?<=\n)\s+')
+
+
+def strip_indentation(multiline_string):
+    return RGX_EXTRA_INDENT.sub('', multiline_string)
+
+
 def decorate_fn_with_doc(new_fn, old_fn, additional_text=""):
     """Make new_fn have old_fn's doc string. This is particularly useful
     for the ``do_...`` commands that hook into the help system.
@@ -183,7 +191,7 b' def decorate_fn_with_doc(new_fn, old_fn, additional_text=""):'
     def wrapper(*args, **kw):
         return new_fn(*args, **kw)
     if old_fn.__doc__:
-        wrapper.__doc__ = old_fn.__doc__ + additional_text
+        wrapper.__doc__ = strip_indentation(old_fn.__doc__) + additional_text
     return wrapper
 
 

IPython/core/display.py

@@ -252,8 +252,9 b' def display(*objs, include=None, exclude=None, metadata=None, transient=None, di'
     display in IPython by following the above approach. But in practice, you
     often need to work with existing classes that you can't easily modify.
 
-    You can refer to the documentation on IPython display formatters in order to
-    register custom formatters for already existing types.
+    You can refer to the documentation on integrating with the display system in
+    order to register custom formatters for already existing types
+    (:ref:`integrating_rich_display`).
 
     .. versionadded:: 5.4 display available without import
     .. versionadded:: 6.1 display available without import

IPython/core/formatters.py

@@ -224,7 +224,7 b' def catch_format_error(method, self, *args, **kwargs):'
         r = method(self, *args, **kwargs)
     except NotImplementedError:
         # don't warn on NotImplementedErrors
-        return None
+        return self._check_return(None, args[0])
     except Exception:
         exc_info = sys.exc_info()
         ip = get_ipython()
@@ -232,7 +232,7 b' def catch_format_error(method, self, *args, **kwargs):'
             ip.showtraceback(exc_info)
         else:
             traceback.print_exception(*exc_info)
-        return None
+        return self._check_return(None, args[0])
     return self._check_return(r, args[0])
 
 

IPython/core/hooks.py

@@ -101,7 +101,7 b' def fix_error_editor(self,filename,linenum,column,msg):'
 `fix_error_editor` is deprecated as of IPython 6.0 and will be removed
 in future versions. It appears to be used only for automatically fixing syntax
 error that has been broken for a few years and has thus been removed. If you
-happend to use this function and still need it please make your voice heard on
+happened to use this function and still need it please make your voice heard on
 the mailing list [e-mail] , or on the GitHub Issue tracker:
 https://github.com/ipython/ipython/issues/9649 """, UserWarning)
 

IPython/core/inputsplitter.py

@@ -290,10 +290,13 b' class InputSplitter(object):'
             isp.push(line)
         print 'Input source was:\n', isp.source_reset(),
     """
-    # Number of spaces of indentation computed from input that has been pushed
-    # so far.  This is the attributes callers should query to get the current
-    # indentation level, in order to provide auto-indent facilities.
-    indent_spaces = 0
+    # A cache for storing the current indentation
+    # The first value stores the most recently processed source input
+    # The second value is the number of spaces for the current indentation 
+    # If self.source matches the first value, the second value is a valid
+    # current indentation. Otherwise, the cache is invalid and the indentation
+    # must be recalculated.
+    _indent_spaces_cache = None, None
     # String, indicating the default input encoding.  It is computed by default
     # at initialization time via get_input_encoding(), but it can be reset by a
     # client with specific knowledge of the encoding.
@@ -313,8 +316,6 b' class InputSplitter(object):'
     _buffer = None
     # Command compiler
     _compile = None
-    # Mark when input has changed indentation all the way back to flush-left
-    _full_dedent = False
     # Boolean indicating whether the current block is complete
     _is_complete = None
     # Boolean indicating whether the current block has an unrecoverable syntax error
@@ -329,13 +330,11 b' class InputSplitter(object):'
 
     def reset(self):
         """Reset the input buffer and associated state."""
-        self.indent_spaces = 0
         self._buffer[:] = []
         self.source = ''
         self.code = None
         self._is_complete = False
         self._is_invalid = False
-        self._full_dedent = False
 
     def source_reset(self):
         """Return the input source and perform a full reset.
@@ -374,7 +373,7 b' class InputSplitter(object):'
             if self._is_invalid:
                 return 'invalid', None
             elif self.push_accepts_more():
-                return 'incomplete', self.indent_spaces
+                return 'incomplete', self.get_indent_spaces()
             else:
                 return 'complete', None
         finally:
@@ -415,7 +414,6 b' class InputSplitter(object):'
         if source.endswith('\\\n'):
             return False
 
-        self._update_indent()
         try:
             with warnings.catch_warnings():
                 warnings.simplefilter('error', SyntaxWarning)
@@ -473,7 +471,7 b' class InputSplitter(object):'
         # If there's just a single line or AST node, and we're flush left, as is
         # the case after a simple statement such as 'a=1', we want to execute it
         # straight away.
-        if self.indent_spaces==0:
+        if self.get_indent_spaces() == 0:
             if len(self.source.splitlines()) <= 1:
                 return False
             
@@ -491,10 +489,20 b' class InputSplitter(object):'
         # General fallback - accept more code
         return True
 
-    def _update_indent(self):
+    def get_indent_spaces(self):
+        sourcefor, n = self._indent_spaces_cache
+        if sourcefor == self.source:
+            return n
+
         # self.source always has a trailing newline
-        self.indent_spaces = find_next_indent(self.source[:-1])
-        self._full_dedent = (self.indent_spaces == 0)
+        n = find_next_indent(self.source[:-1])
+        self._indent_spaces_cache = (self.source, n)
+        return n
+
+    # Backwards compatibility. I think all code that used .indent_spaces was
+    # inside IPython, but we can leave this here until IPython 7 in case any
+    # other modules are using it. -TK, November 2017
+    indent_spaces = property(get_indent_spaces)
 
     def _store(self, lines, buffer=None, store='source'):
         """Store one or more lines of input.
@@ -698,41 +706,55 b' class IPythonInputSplitter(InputSplitter):'
         # flush the buffer.
         self._store(lines, self._buffer_raw, 'source_raw')
 
+        transformed_lines_list = []
         for line in lines_list:
-            out = self.push_line(line)
+            transformed = self._transform_line(line)
+            if transformed is not None:
+                transformed_lines_list.append(transformed)
 
-        return out
-    
-    def push_line(self, line):
-        buf = self._buffer
+        if transformed_lines_list:
+            transformed_lines = '\n'.join(transformed_lines_list)
+            return super(IPythonInputSplitter, self).push(transformed_lines)
+        else:
+            # Got nothing back from transformers - they must be waiting for
+            # more input.
+            return False
+
+    def _transform_line(self, line):
+        """Push a line of input code through the various transformers.
+        
+        Returns any output from the transformers, or None if a transformer
+        is accumulating lines.
         
+        Sets self.transformer_accumulating as a side effect.
+        """
         def _accumulating(dbg):
             #print(dbg)
             self.transformer_accumulating = True
-            return False
-        
+            return None
+
         for transformer in self.physical_line_transforms:
             line = transformer.push(line)
             if line is None:
                 return _accumulating(transformer)
-        
+
         if not self.within_python_line:
             line = self.assemble_logical_lines.push(line)
             if line is None:
-                return _accumulating('acc logical line')        
-        
+                return _accumulating('acc logical line')
+
             for transformer in self.logical_line_transforms:
                 line = transformer.push(line)
                 if line is None:
                     return _accumulating(transformer)
-        
+
         line = self.assemble_python_lines.push(line)
         if line is None:
             self.within_python_line = True
             return _accumulating('acc python line')
         else:
             self.within_python_line = False
-        
+
         for transformer in self.python_line_transforms:
             line = transformer.push(line)
             if line is None:
@@ -740,4 +762,5 b' class IPythonInputSplitter(InputSplitter):'
 
         #print("transformers clear") #debug
         self.transformer_accumulating = False
-        return super(IPythonInputSplitter, self).push(line)
+        return line
+

IPython/core/interactiveshell.py

@@ -193,8 +193,8 b' class ExecutionInfo(object):'
         name = self.__class__.__qualname__
         raw_cell = ((self.raw_cell[:50] + '..')
                     if len(self.raw_cell) > 50 else self.raw_cell)
-        return '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s result=%s>' %\
-               (name, id(self), raw_cell, store_history, silent, shell_futures, repr(self.result))
+        return '<%s object at %x, raw_cell="%s" store_history=%s silent=%s shell_futures=%s>' %\
+               (name, id(self), raw_cell, self.store_history, self.silent, self.shell_futures)
 
 
 class ExecutionResult(object):
@@ -1899,7 +1899,7 b' class InteractiveShell(SingletonConfigurable):'
                 # Not the format we expect; leave it alone
                 pass
 
-        # If the error occured when executing compiled code, we should provide full stacktrace.
+        # If the error occurred when executing compiled code, we should provide full stacktrace.
         elist = traceback.extract_tb(last_traceback) if running_compiled_code else []
         stb = self.SyntaxTB.structured_traceback(etype, value, elist)
         self._showtraceback(etype, value, stb)
@@ -1940,7 +1940,7 b' class InteractiveShell(SingletonConfigurable):'
 
     def _indent_current_str(self):
         """return the current level of indentation as a string"""
-        return self.input_splitter.indent_spaces * ' '
+        return self.input_splitter.get_indent_spaces() * ' '
 
     #-------------------------------------------------------------------------
     # Things related to text completion

IPython/core/magics/basic.py

@@ -406,7 +406,7 b' Currently the magic system has the following functions:""",'
         The Python package manager (pip) can only be used from outside of IPython.
         Please reissue the `pip` command in a separate terminal or command prompt.
 
-        See the Python documentation for more informations on how to install packages:
+        See the Python documentation for more information on how to install packages:
 
             https://docs.python.org/3/installing/'''.format(args=args)))
 

IPython/core/magics/code.py

@@ -369,14 +369,14 b' class CodeMagics(Magics):'
 
         l = len(contents)
 
-        # 200 000 is ~ 2500 full 80 caracter lines
+        # 200 000 is ~ 2500 full 80 character lines
         # so in average, more than 5000 lines
         if l > 200000 and 'y' not in opts:
             try:
                 ans = self.shell.ask_yes_no(("The text you're trying to load seems pretty big"\
                 " (%d characters). Continue (y/[N]) ?" % l), default='n' )
             except StdinNotImplementedError:
-                #asume yes if raw input not implemented
+                #assume yes if raw input not implemented
                 ans = True
 
             if ans is False :

IPython/core/oinspect.py

@@ -591,9 +591,9 b' class Inspector(Colorable):'
             Name of the variable pointing to `obj`.
         formatter: callable
         info:
-            already computed informations
+            already computed information
         detail_level: integer
-            Granularity of detail level, if set to 1, give more informations.
+            Granularity of detail level, if set to 1, give more information.
         """
 
         info = self._info(obj, oname=oname, info=info, detail_level=detail_level)
@@ -679,7 +679,7 b' class Inspector(Colorable):'
 
               The formatter is a callable that takes a string as an input
               and returns either a formatted string or a mime type bundle
-              in the form of a dictionnary.
+              in the form of a dictionary.
 
               Although the support of custom formatter returning a string
               instead of a mime type bundle is deprecated.

IPython/core/prefilter.py

@@ -43,7 +43,7 b" re_fun_name = re.compile(r'[a-zA-Z_]([a-zA-Z0-9_.]*) *$')"
 # particular, all binary operators should be excluded, so that if foo is
 # callable, foo OP bar doesn't become foo(OP bar), which is invalid.  The
 # characters '!=()' don't need to be checked for, as the checkPythonChars
-# routine explicitely does so, to catch direct calls and rebindings of
+# routine explicitly does so, to catch direct calls and rebindings of
 # existing names.
 
 # Warning: the '-' HAS TO BE AT THE END of the first group, otherwise

IPython/core/tests/test_completer.py

@@ -939,6 +939,34 b' def test_object_key_completion():'
     nt.assert_in('qwick', matches)
 
 
+class NamedInstanceMetaclass(type):
+    def __getitem__(cls, item):
+        return cls.get_instance(item)
+
+class NamedInstanceClass(object, metaclass=NamedInstanceMetaclass):
+    def __init__(self, name):
+        if not hasattr(self.__class__, 'instances'):
+            self.__class__.instances = {}
+        self.__class__.instances[name] = self
+
+    @classmethod
+    def _ipython_key_completions_(cls):
+        return cls.instances.keys()
+
+    @classmethod
+    def get_instance(cls, name):
+        return cls.instances[name]
+
+def test_class_key_completion():
+    ip = get_ipython()
+    NamedInstanceClass('qwerty')
+    NamedInstanceClass('qwick')
+    ip.user_ns['named_instance_class'] = NamedInstanceClass
+
+    _, matches = ip.Completer.complete(line_buffer="named_instance_class['qw")
+    nt.assert_in('qwerty', matches)
+    nt.assert_in('qwick', matches)
+
 def test_tryimport():
     """
     Test that try-import don't crash on trailing dot, and import modules before

IPython/core/tests/test_displayhook.py

@@ -56,7 +56,7 b' def test_underscore_no_overrite_builtins():'
 
 def test_interactivehooks_ast_modes():
     """
-    Test that ast nodes can be triggerd with different modes
+    Test that ast nodes can be triggered with different modes
     """
     saved_mode = ip.ast_node_interactivity
     ip.ast_node_interactivity = 'last_expr_or_assign'
@@ -83,7 +83,7 b' def test_interactivehooks_ast_modes():'
 
 def test_interactivehooks_ast_modes_semi_supress():
     """
-    Test that ast nodes can be triggerd with different modes and supressed
+    Test that ast nodes can be triggered with different modes and suppressed
     by semicolon
     """
     saved_mode = ip.ast_node_interactivity

IPython/core/tests/test_formatters.py

@@ -521,3 +521,13 b' def test_repr_mime_meta():'
             'height': 10,
         }
     })
+
+def test_repr_mime_failure():
+    class BadReprMime(object):
+        def _repr_mimebundle_(self, include=None, exclude=None):
+            raise RuntimeError
+
+    f = get_ipython().display_formatter
+    obj = BadReprMime()
+    d, md = f.format(obj)
+    nt.assert_in('text/plain', d)

IPython/core/tests/test_inputsplitter.py

@@ -37,7 +37,7 b' def mini_interactive_loop(input_func):'
     # input indefinitely, until some exit/quit command was issued.  Here we
     # only illustrate the basic inner loop.
     while isp.push_accepts_more():
-        indent = ' '*isp.indent_spaces
+        indent = ' '*isp.get_indent_spaces()
         prompt = '>>> ' + indent
         line = indent + input_func(prompt)
         isp.push(line)
@@ -132,7 +132,7 b' class InputSplitterTestCase(unittest.TestCase):'
         isp.push('x=1')
         isp.reset()
         self.assertEqual(isp._buffer, [])
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
         self.assertEqual(isp.source, '')
         self.assertEqual(isp.code, None)
         self.assertEqual(isp._is_complete, False)
@@ -149,21 +149,21 b' class InputSplitterTestCase(unittest.TestCase):'
     def test_indent(self):
         isp = self.isp # shorthand
         isp.push('x=1')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
         isp.push('if 1:\n    x=1')
-        self.assertEqual(isp.indent_spaces, 4)
+        self.assertEqual(isp.get_indent_spaces(), 4)
         isp.push('y=2\n')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
 
     def test_indent2(self):
         isp = self.isp
         isp.push('if 1:')
-        self.assertEqual(isp.indent_spaces, 4)
+        self.assertEqual(isp.get_indent_spaces(), 4)
         isp.push('    x=1')
-        self.assertEqual(isp.indent_spaces, 4)
+        self.assertEqual(isp.get_indent_spaces(), 4)
         # Blank lines shouldn't change the indent level
         isp.push(' '*2)
-        self.assertEqual(isp.indent_spaces, 4)
+        self.assertEqual(isp.get_indent_spaces(), 4)
 
     def test_indent3(self):
         isp = self.isp
@@ -171,75 +171,75 b' class InputSplitterTestCase(unittest.TestCase):'
         # shouldn't get confused.
         isp.push("if 1:")
         isp.push("    x = (1+\n    2)")
-        self.assertEqual(isp.indent_spaces, 4)
+        self.assertEqual(isp.get_indent_spaces(), 4)
 
     def test_indent4(self):
         isp = self.isp
         # whitespace after ':' should not screw up indent level
         isp.push('if 1: \n    x=1')
-        self.assertEqual(isp.indent_spaces, 4)
+        self.assertEqual(isp.get_indent_spaces(), 4)
         isp.push('y=2\n')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
         isp.push('if 1:\t\n    x=1')
-        self.assertEqual(isp.indent_spaces, 4)
+        self.assertEqual(isp.get_indent_spaces(), 4)
         isp.push('y=2\n')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
 
     def test_dedent_pass(self):
         isp = self.isp # shorthand
         # should NOT cause dedent
         isp.push('if 1:\n    passes = 5')
-        self.assertEqual(isp.indent_spaces, 4)
+        self.assertEqual(isp.get_indent_spaces(), 4)
         isp.push('if 1:\n     pass')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
         isp.push('if 1:\n     pass   ')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
 
     def test_dedent_break(self):
         isp = self.isp # shorthand
         # should NOT cause dedent
         isp.push('while 1:\n    breaks = 5')
-        self.assertEqual(isp.indent_spaces, 4)
+        self.assertEqual(isp.get_indent_spaces(), 4)
         isp.push('while 1:\n     break')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
         isp.push('while 1:\n     break   ')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
 
     def test_dedent_continue(self):
         isp = self.isp # shorthand
         # should NOT cause dedent
         isp.push('while 1:\n    continues = 5')
-        self.assertEqual(isp.indent_spaces, 4)
+        self.assertEqual(isp.get_indent_spaces(), 4)
         isp.push('while 1:\n     continue')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
         isp.push('while 1:\n     continue   ')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
 
     def test_dedent_raise(self):
         isp = self.isp # shorthand
         # should NOT cause dedent
         isp.push('if 1:\n    raised = 4')
-        self.assertEqual(isp.indent_spaces, 4)
+        self.assertEqual(isp.get_indent_spaces(), 4)
         isp.push('if 1:\n     raise TypeError()')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
         isp.push('if 1:\n     raise')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
         isp.push('if 1:\n     raise      ')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
 
     def test_dedent_return(self):
         isp = self.isp # shorthand
         # should NOT cause dedent
         isp.push('if 1:\n    returning = 4')
-        self.assertEqual(isp.indent_spaces, 4)
+        self.assertEqual(isp.get_indent_spaces(), 4)
         isp.push('if 1:\n     return 5 + 493')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
         isp.push('if 1:\n     return')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
         isp.push('if 1:\n     return      ')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
         isp.push('if 1:\n     return(0)')
-        self.assertEqual(isp.indent_spaces, 0)
+        self.assertEqual(isp.get_indent_spaces(), 0)
 
     def test_push(self):
         isp = self.isp
@@ -508,7 +508,7 b" if __name__ == '__main__':"
         while True:
             prompt = start_prompt
             while isp.push_accepts_more():
-                indent = ' '*isp.indent_spaces
+                indent = ' '*isp.get_indent_spaces()
                 if autoindent:
                     line = indent + input(prompt+indent)
                 else:

IPython/core/tests/test_magic.py

@@ -106,7 +106,7 b' def test_magic_error_status():'
 def test_config():
     """ test that config magic does not raise
     can happen if Configurable init is moved too early into
-    Magics.__init__ as then a Config object will be registerd as a
+    Magics.__init__ as then a Config object will be registered as a
     magic.
     """
     ## should not raise.
@@ -587,7 +587,7 b' def test_timeit_special_syntax():'
 
 def test_timeit_return():
     """
-    test wether timeit -o return object
+    test whether timeit -o return object
     """
 
     res = _ip.run_line_magic('timeit','-n10 -r10 -o 1')

IPython/core/usage.py

@@ -298,7 +298,7 b' System commands:'
 !cp a.txt b/     : System command escape, calls os.system()
 cp a.txt b/      : after %rehashx, most system commands work without !
 cp ${f}.txt $bar : Variable expansion in magics and system commands
-files = !ls /usr : Capture sytem command output
+files = !ls /usr : Capture system command output
 files.s, files.l, files.n: "a b c", ['a','b','c'], 'a\nb\nc'
 
 History:

IPython/extensions/autoreload.py

@@ -184,7 +184,7 b' class ModuleReloader(object):'
         if not hasattr(module, '__file__') or module.__file__ is None:
             return None, None
 
-        if getattr(module, '__name__', None) in ['__mp_main__', '__main__']:
+        if getattr(module, '__name__', None) in [None, '__mp_main__', '__main__']:
             # we cannot reload(__main__) or reload(__mp_main__)
             return None, None
 

IPython/lib/deepreload.py

@@ -273,7 +273,7 b' def deep_reload_hook(m):'
     """Replacement for reload()."""
     # Hardcode this one  as it would raise a NotImplemeentedError from the
     # bowels of Python and screw up the import machinery after.
-    # unlike other imports the `exclude` list aleady in place is not enough.
+    # unlike other imports the `exclude` list already in place is not enough.
 
     if m is types:
         return m

IPython/lib/demo.py

@@ -231,7 +231,7 b' class Demo(object):'
             value.
 
           - format_rst(False): a bool to enable comments and doc strings
-            formating with pygments rst lexer
+            formatting with pygments rst lexer
 
           - formatter('terminal'): a string of pygments formatter name to be
             used. Useful values for terminals: terminal, terminal256,

IPython/lib/display.py

@@ -508,7 +508,7 b' class FileLinks(FileLink):'
             # Working on a platform where the path separator is "\", so
             # must convert these to "/" for generating a URI
             def fp_cleaner(fp):
-                # Replace all occurences of backslash ("\") with a forward
+                # Replace all occurrences of backslash ("\") with a forward
                 # slash ("/") - this is necessary on windows when a path is
                 # provided as input, but we must link to a URI
                 return fp.replace('\\','/')

IPython/lib/editorhooks.py

@@ -96,7 +96,7 b" def idle(exe=u'idle'):"
         import idlelib
         p = os.path.dirname(idlelib.__filename__)
         # i'm not sure if this actually works. Is this idle.py script
-        # guarenteed to be executable?
+        # guaranteed to be executable?
         exe = os.path.join(p, 'idle.py')
     install_editor(exe + u' {filename}')
 

IPython/lib/inputhookgtk3.py

@@ -29,6 +29,6 b' def _main_quit(*args, **kwargs):'
 
 
 def inputhook_gtk3():
-    GLib.io_add_watch(sys.stdin, GLib.IO_IN, _main_quit)
+    GLib.io_add_watch(sys.stdin, GLib.PRIORITY_DEFAULT, GLib.IO_IN, _main_quit)
     Gtk.main()
     return 0

IPython/sphinxext/ipython_directive.py

@@ -287,14 +287,6 b' class EmbeddedSphinxShell(object):'
         IP = InteractiveShell.instance(config=config, profile_dir=profile)
         atexit.register(self.cleanup)
 
-        sys.stdout = self.cout
-        sys.stderr = self.cout
-
-        # For debugging, so we can see normal output, use this:
-        #from IPython.utils.io import Tee
-        #sys.stdout = Tee(self.cout, channel='stdout') # dbg
-        #sys.stderr = Tee(self.cout, channel='stderr') # dbg
-
         # Store a few parts of IPython we'll need.
         self.IP = IP
         self.user_ns = self.IP.user_ns

IPython/terminal/pt_inputhooks/gtk3.py

@@ -8,5 +8,5 b' def _main_quit(*args, **kwargs):'
     return False
 
 def inputhook(context):
-    GLib.io_add_watch(context.fileno(), GLib.IO_IN, _main_quit)
+    GLib.io_add_watch(context.fileno(), GLib.PRIORITY_DEFAULT, GLib.IO_IN, _main_quit)
     Gtk.main()

IPython/terminal/pt_inputhooks/tk.py

@@ -34,7 +34,7 b' Wrapper around the eventloop that gives some time to the Tkinter GUI to process'
 events when it's loaded and while we are waiting for input at the REPL. This
 way we don't block the UI of for instance ``turtle`` and other Tk libraries.
 
-(Normally Tkinter registeres it's callbacks in ``PyOS_InputHook`` to integrate
+(Normally Tkinter registers it's callbacks in ``PyOS_InputHook`` to integrate
 in readline. ``prompt-toolkit`` doesn't understand that input hook, but this
 will fix it for Tk.)
 """

IPython/testing/ipunittest.py

@@ -55,7 +55,7 b' class IPython2PythonConverter(object):'
     """Convert IPython 'syntax' to valid Python.
 
     Eventually this code may grow to be the full IPython syntax conversion
-    implementation, but for now it only does prompt convertion."""
+    implementation, but for now it only does prompt conversion."""
     
     def __init__(self):
         self.rps1 = re.compile(r'In\ \[\d+\]: ')

IPython/testing/tools.py

@@ -87,7 +87,7 b' def parse_test_output(txt):'
     txt : str
       Text output of a test run, assumed to contain a line of one of the
       following forms::
-      
+
         'FAILED (errors=1)'
         'FAILED (failures=1)'
         'FAILED (errors=1, failures=1)'
@@ -186,7 +186,7 b' def ipexec(fname, options=None, commands=()):'
 
     Returns
     -------
-    (stdout, stderr) of ipython subprocess.
+    ``(stdout, stderr)`` of ipython subprocess.
     """
     if options is None: options = []
 
@@ -333,13 +333,13 b' notprinted_msg = """Did not find {0!r} in printed output (on {1}):'
 
 class AssertPrints(object):
     """Context manager for testing that code prints certain text.
-    
+
     Examples
     --------
     >>> with AssertPrints("abc", suppress=False):
     ...     print("abcd")
     ...     print("def")
-    ... 
+    ...
     abcd
     def
     """
@@ -349,13 +349,13 b' class AssertPrints(object):'
             self.s = [self.s]
         self.channel = channel
         self.suppress = suppress
-    
+
     def __enter__(self):
         self.orig_stream = getattr(sys, self.channel)
         self.buffer = MyStringIO()
         self.tee = Tee(self.buffer, channel=self.channel)
         setattr(sys, self.channel, self.buffer if self.suppress else self.tee)
-    
+
     def __exit__(self, etype, value, traceback):
         try:
             if value is not None:
@@ -381,7 +381,7 b' printed_msg = """Found {0!r} in printed output (on {1}):'
 
 class AssertNotPrints(AssertPrints):
     """Context manager for checking that certain output *isn't* produced.
-    
+
     Counterpart of AssertPrints"""
     def __exit__(self, etype, value, traceback):
         try:

IPython/utils/_process_win32.py

@@ -166,7 +166,7 b' try:'
         """Split a command line's arguments in a shell-like manner.
 
         This is a special version for windows that use a ctypes call to CommandLineToArgvW
-        to do the argv splitting. The posix paramter is ignored.
+        to do the argv splitting. The posix parameter is ignored.
         
         If strict=False, process_common.arg_split(...strict=False) is used instead.
         """

IPython/utils/dir2.py

@@ -6,6 +6,7 b''
 # Distributed under the terms of the Modified BSD License.
 
 import inspect
+import types
 
 
 def safe_hasattr(obj, attr):
@@ -53,16 +54,13 b' def dir2(obj):'
 def get_real_method(obj, name):
     """Like getattr, but with a few extra sanity checks:
 
-    - If obj is a class, ignore its methods
+    - If obj is a class, ignore everything except class methods
     - Check if obj is a proxy that claims to have all attributes
     - Catch attribute access failing with any exception
     - Check that the attribute is a callable object
 
     Returns the method or None.
     """
-    if inspect.isclass(obj):
-        return None
-
     try:
         canary = getattr(obj, '_ipython_canary_method_should_not_exist_', None)
     except Exception:
@@ -77,6 +75,9 b' def get_real_method(obj, name):'
     except Exception:
         return None
 
+    if inspect.isclass(obj) and not isinstance(m, types.MethodType):
+        return None
+
     if callable(m):
         return m
 

IPython/utils/path.py

@@ -115,7 +115,7 b' def filefind(filename, path_dirs=None):'
     """Find a file by looking through a sequence of paths.
 
     This iterates through a sequence of paths looking for a file and returns
-    the full, absolute path of the first occurence of the file.  If no set of
+    the full, absolute path of the first occurrence of the file.  If no set of
     path dirs is given, the filename is tested as is, after running through
     :func:`expandvars` and :func:`expanduser`.  Thus a simple call::
 

IPython/utils/tests/test_path.py

@@ -192,7 +192,7 b' def test_get_xdg_dir_0():'
 
 @with_environment
 def test_get_xdg_dir_1():
-    """test_get_xdg_dir_1, check nonexistant xdg_dir"""
+    """test_get_xdg_dir_1, check nonexistent xdg_dir"""
     reload(path)
     path.get_home_dir = lambda : HOME_TEST_DIR
     os.name = "posix"

IPython/utils/text.py

@@ -667,7 +667,7 b' def compute_item_matrix(items, row_first=False, empty=None, *args, **kwargs) :'
     separator_size : int (default=2)
         How much caracters will be used as a separation between each columns.
     displaywidth : int (default=80)
-        The width of the area onto wich the columns should enter
+        The width of the area onto which the columns should enter
 
     Returns
     -------
@@ -675,7 +675,7 b' def compute_item_matrix(items, row_first=False, empty=None, *args, **kwargs) :'
     strings_matrix
 
         nested list of string, the outer most list contains as many list as
-        rows, the innermost lists have each as many element as colums. If the
+        rows, the innermost lists have each as many element as columns. If the
         total number of elements in `items` does not equal the product of
         rows*columns, the last element of some lists are filled with `None`.
 

IPython/utils/tokenize2.py

@@ -13,6 +13,7 b' Patches:'
 - u and rb literals are allowed under Python 3.3 and above.
 
 ------------------------------------------------------------------------------
+
 Tokenization help for Python programs.
 
 tokenize(readline) is a generator that breaks a stream of bytes into

docs/README.rst

@@ -3,6 +3,7 b' IPython Documentation'
 
 This directory contains the majority of the documentation for IPython.
 
+
 Deploy docs
 -----------
 
@@ -12,13 +13,24 b' Pull requests.'
 
 Requirements
 ------------
-The following tools are needed to build the documentation:
+
+The documentation must be built using Python 3.
+
+In additions to :ref:`devinstall`,
+the following tools are needed to build the documentation:
 
  - sphinx
+ - sphinx_rtd_theme
+ - docrepr
 
-On Debian-based systems, you should be able to run::
+In a conda environment, or a Python 3 ``venv``, you should be able to run::
 
-    sudo apt-get install python-sphinx
+  cd ipython
+  pip install -U -r docs/requirements.txt
+
+
+Build Commands
+--------------
 
 The documentation gets built using ``make``, and comes in several flavors.
 
@@ -35,5 +47,18 b' API documentation. This build target skips that.'
 
 You can run ``make help`` to see information on all possible make targets.
 
+To save time,
+the make targets above only proceess the files that have been changed since the
+previous docs build.
+To remove the previous docs build you can use ``make clean``.
+You can also combine ``clean`` with other `make` commands;
+for example,
+``make clean html`` will do a complete rebuild of the docs or `make clean pdf` will do a complete build of the pdf.
+
 
+Continuous Integration
+----------------------
 
+Documentation builds are included in the Travis-CI continuous integration process,
+so you can see the results of the docs build for any pull request at
+https://travis-ci.org/ipython/ipython/pull_requests.

docs/requirements.txt

@@ -1,3 +1,6 b''
 -e .
 ipykernel
 setuptools>=18.5
+sphinx
+sphinx-rtd-theme
+docrepr

docs/source/conf.py

@@ -57,6 +57,7 b' extensions = ['
     'sphinx.ext.doctest',
     'sphinx.ext.inheritance_diagram',
     'sphinx.ext.intersphinx',
+    'sphinx.ext.graphviz',
     'IPython.sphinxext.ipython_console_highlighting',
     'IPython.sphinxext.ipython_directive',
     'sphinx.ext.napoleon',  # to preprocess docstrings

docs/source/config/integrating.rst

@@ -19,6 +19,8 b' returns a list of objects which are possible keys in a subscript expression'
 .. versionadded:: 5.0
    Custom key completions
 
+.. _integrating_rich_display:
+
 Rich display
 ============
 
@@ -28,8 +30,8 b' these are surrounded by single, not double underscores.'
 
 Both the notebook and the Qt console can display ``svg``, ``png`` and ``jpeg``
 representations. The notebook can also display ``html``, ``javascript``,
-and ``latex``. If the methods don't exist, or return ``None``, it falls
-back to a standard ``repr()``.
+``markdown`` and ``latex``. If the methods don't exist, or return ``None``, it
+falls back to a standard ``repr()``.
 
 For example::
 
@@ -40,6 +42,38 b' For example::'
         def _repr_html_(self):
             return "<h1>" + self.text + "</h1>"
 
+There are also two more powerful display methods:
+
+.. class:: MyObject
+
+   .. method:: _repr_mimebundle_(include=None, exclude=None)
+
+     Should return a dictionary of multiple formats, keyed by mimetype, or a tuple
+     of two dictionaries: *data, metadata*. If this returns something, other
+     ``_repr_*_`` methods are ignored. The method should take keyword arguments
+     ``include`` and ``exclude``, though it is not required to respect them.
+
+   .. method:: _ipython_display_()
+
+      Displays the object as a side effect; the return value is ignored. If this
+      is defined, all other display methods are ignored.
+
+Formatters for third-party types
+--------------------------------
+
+The user can also register formatters for types without modifying the class::
+
+    from bar import Foo
+
+    def foo_html(obj):
+        return '<marquee>Foo object %s</marquee>' % obj.name
+
+    html_formatter = get_ipython().display_formatter.formatters['text/html']
+    html_formatter.for_type(Foo, foo_html)
+
+    # Or register a type without importing it - this does the same as above:
+    html_formatter.for_type_by_name('bar.Foo', foo_html)
+
 Custom exception tracebacks
 ===========================
 

docs/source/install/kernel_install.rst

@@ -53,7 +53,7 b' environments, you will need to specify unique names for the kernelspecs.'
 
 Make sure you have ipykernel installed in your environement. If you are using
 ``pip`` to install ``ipykernel`` in a conda env, make sure ``pip`` is
-installed::
+installed:
 
 .. sourcecode:: bash
 
@@ -86,7 +86,7 b' Using virtualenv or conda envs, you can make your IPython kernel in one env avai'
 
     /path/to/kernel/env/bin/python -m ipykernel install --prefix=/path/to/jupyter/env --name 'python-my-env'
 
-Note that this command will create a new configuration for the kernel in one of the prefered location (see ``jupyter --paths`` command for more details):
+Note that this command will create a new configuration for the kernel in one of the preferred location (see ``jupyter --paths`` command for more details):
 
 * system-wide (e.g. /usr/local/share),
 * in Jupyter's env (sys.prefix/share),

docs/source/interactive/tutorial.rst

@@ -239,8 +239,8 b' To run any command at the system shell, simply prefix it with ``!``, e.g.::'
     
 You can capture the output into a Python list, e.g.: ``files = !ls``. To pass
 the values of Python variables or expressions to system commands, prefix them
-with $: ``!grep -rF $pattern ipython/*``. See :ref:`our shell section
-<system_shell_access>` for more details.
+with $: ``!grep -rF $pattern ipython/*`` or wrap in `{braces}`. See :ref:`our
+shell section <system_shell_access>` for more details.
 
 Define your own system aliases
 ------------------------------

docs/source/whatsnew/github-stats-0.11.rst

@@ -34,7 +34,7 b' Pull requests (226):'
 * `574 <https://github.com/ipython/ipython/issues/574>`_: Getcwdu
 * `565 <https://github.com/ipython/ipython/issues/565>`_: don't move old config files, keep nagging the user
 * `575 <https://github.com/ipython/ipython/issues/575>`_: Added more docstrings to IPython.zmq.session.
-* `567 <https://github.com/ipython/ipython/issues/567>`_: fix trailing whitespace from reseting indentation
+* `567 <https://github.com/ipython/ipython/issues/567>`_: fix trailing whitespace from resetting indentation
 * `564 <https://github.com/ipython/ipython/issues/564>`_: Command line args in docs
 * `560 <https://github.com/ipython/ipython/issues/560>`_: reorder qt support in kernel
 * `561 <https://github.com/ipython/ipython/issues/561>`_: command-line suggestions
@@ -445,7 +445,7 b' Regular issues (285):'
 * `46 <https://github.com/ipython/ipython/issues/46>`_: Input to %timeit is not preparsed
 * `285 <https://github.com/ipython/ipython/issues/285>`_: ipcluster local -n 4 fails
 * `205 <https://github.com/ipython/ipython/issues/205>`_: In the Qt console, Tab should insert 4 spaces when not completing
-* `145 <https://github.com/ipython/ipython/issues/145>`_: Bug on MSW sytems: idle can not be set as default IPython editor. Fix Suggested.
+* `145 <https://github.com/ipython/ipython/issues/145>`_: Bug on MSW systems: idle can not be set as default IPython editor. Fix Suggested.
 * `77 <https://github.com/ipython/ipython/issues/77>`_: ipython oops in cygwin
 * `121 <https://github.com/ipython/ipython/issues/121>`_: If plot windows are closed via window controls, no more plotting is possible.
 * `111 <https://github.com/ipython/ipython/issues/111>`_: Iterator version of TaskClient.map() that returns results as they become available
@@ -494,7 +494,7 b' Regular issues (285):'
 * `161 <https://github.com/ipython/ipython/issues/161>`_: make ipythonqt exit without dialog when exit() is called
 * `263 <https://github.com/ipython/ipython/issues/263>`_: [ipython + numpy] Some test errors 
 * `256 <https://github.com/ipython/ipython/issues/256>`_: reset docstring ipython 0.10 
-* `258 <https://github.com/ipython/ipython/issues/258>`_: allow caching to avoid matplotlib object referrences
+* `258 <https://github.com/ipython/ipython/issues/258>`_: allow caching to avoid matplotlib object references
 * `248 <https://github.com/ipython/ipython/issues/248>`_: Can't open and read files after upgrade from 0.10 to 0.10.0
 * `247 <https://github.com/ipython/ipython/issues/247>`_: ipython + Stackless
 * `245 <https://github.com/ipython/ipython/issues/245>`_: Magic save and macro missing newlines, line ranges don't match prompt numbers.

docs/source/whatsnew/github-stats-0.12.rst

@@ -284,7 +284,7 b' Pull requests (257):'
 * `798 <https://github.com/ipython/ipython/issues/798>`_: pexpect & Python 3
 * `804 <https://github.com/ipython/ipython/issues/804>`_: Magic 'range' crash if greater than len(input_hist)
 * `821 <https://github.com/ipython/ipython/issues/821>`_: update tornado dependency to 2.1
-* `807 <https://github.com/ipython/ipython/issues/807>`_: Faciliate ssh tunnel sharing by announcing ports
+* `807 <https://github.com/ipython/ipython/issues/807>`_: Facilitate ssh tunnel sharing by announcing ports
 * `795 <https://github.com/ipython/ipython/issues/795>`_: Add cluster-id for multiple cluster instances per profile
 * `742 <https://github.com/ipython/ipython/issues/742>`_: Glut
 * `668 <https://github.com/ipython/ipython/issues/668>`_: Greedy completer

docs/source/whatsnew/github-stats-1.0.rst

@@ -581,7 +581,7 b' Pull Requests (793):'
 * :ghpull:`3575`: tweak `run -d` message to 'continue execution'
 * :ghpull:`3569`: add PYTHONSTARTUP to startup files
 * :ghpull:`3567`: Trigger a single event on js app initilized
-* :ghpull:`3565`: style.min.css shoudl always exist...
+* :ghpull:`3565`: style.min.css should always exist...
 * :ghpull:`3531`: allow markdown in heading cells
 * :ghpull:`3577`: Simplify codemirror ipython-mode
 * :ghpull:`3495`: Simplified regexp, and suggestions for clearer regexps.
@@ -666,7 +666,7 b' Pull Requests (793):'
 * :ghpull:`3373`: make cookie_secret configurable
 * :ghpull:`3307`: switch default ws_url logic to js side
 * :ghpull:`3392`: Restore anchor link on h2-h6
-* :ghpull:`3369`: Use different treshold for (auto)scroll in output
+* :ghpull:`3369`: Use different threshold for (auto)scroll in output
 * :ghpull:`3370`: normalize unicode notebook filenames
 * :ghpull:`3372`: base default cookie name on request host+port
 * :ghpull:`3378`: disable CodeMirror drag/drop on Safari
@@ -848,7 +848,7 b' Pull Requests (793):'
 * :ghpull:`2941`: fix baseUrl
 * :ghpull:`2903`: Specify toggle value on cell line number
 * :ghpull:`2911`: display order in output area configurable
-* :ghpull:`2897`: Dont rely on BaseProjectUrl data in body tag
+* :ghpull:`2897`: Don't rely on BaseProjectUrl data in body tag
 * :ghpull:`2894`: Cm configurable
 * :ghpull:`2927`: next release will be 1.0
 * :ghpull:`2932`: Simplify using notebook static files from external code
@@ -1476,7 +1476,7 b' Issues (691):'
 * :ghissue:`3374`: ipython qtconsole does not display the prompt on OSX
 * :ghissue:`3380`: simple call to kernel
 * :ghissue:`3379`: TaskRecord key 'started' not set
-* :ghissue:`3241`: notebook conection time out
+* :ghissue:`3241`: notebook connection time out
 * :ghissue:`3334`: magic interpreter interpretes non magic commands?
 * :ghissue:`3326`: python3.3: Type error when launching SGE cluster in IPython notebook
 * :ghissue:`3349`: pip3 doesn't run 2to3?
@@ -1802,7 +1802,7 b' Issues (691):'
 * :ghissue:`2351`: Multiple Notebook Apps: cookies not port specific, clash with each other
 * :ghissue:`2350`: running unittest from qtconsole prints output to terminal
 * :ghissue:`2303`:  remote tracebacks broken since 952d0d6 (PR #2223)
-* :ghissue:`2330`: qtconsole does not hightlight tab-completion suggestion with custom stylesheet
+* :ghissue:`2330`: qtconsole does not highlight tab-completion suggestion with custom stylesheet
 * :ghissue:`2325`: Parsing Tex formula fails in Notebook
 * :ghissue:`2324`: Parsing Tex formula fails
 * :ghissue:`1474`: Add argument to `run -n` for custom namespace

docs/source/whatsnew/github-stats-2.0.rst

@@ -1422,7 +1422,7 b' Issues (434):'
 * :ghissue:`3402`: Feature Request: Save As (latex, html,..etc) as a menu option in Notebook rather than explicit need to invoke nbconvert
 * :ghissue:`3224`: Revisit layout of notebook area
 * :ghissue:`2746`: rerunning a cell with long output (exception) scrolls to much (html notebook)
-* :ghissue:`2667`: can't save opened notebook if accidently delete the notebook in the dashboard
+* :ghissue:`2667`: can't save opened notebook if accidentally delete the notebook in the dashboard
 * :ghissue:`3026`: Reporting errors from _repr_<type>_ methods
 * :ghissue:`1844`: Notebook does not exist and permalinks
 * :ghissue:`2450`: [closed PR] Prevent jumping of window to input when output is clicked.

docs/source/whatsnew/version0.10.rst

@@ -34,7 +34,7 b' Highlights of this release:'
   (such as a linux text console without X11).
   
 For this release we merged 24 commits, contributed by the following people
-(please let us know if we ommitted your name and we'll gladly fix this in the
+(please let us know if we omitted your name and we'll gladly fix this in the
 notes for the future):
 
 * Fernando Perez

docs/source/whatsnew/version3_widget_migration.rst

@@ -190,7 +190,7 b' Smaller Changes'
    (`#6990 <https://github.com/ipython/ipython/pull/6990>`__).
 -  A warning was added that shows on widget import because it's expected
    that the API will change again by IPython 4.0. This warning can be
-   supressed (`#7107 <https://github.com/ipython/ipython/pull/7107>`__,
+   suppressed (`#7107 <https://github.com/ipython/ipython/pull/7107>`__,
    `#7200 <https://github.com/ipython/ipython/pull/7200>`__,
    `#7201 <https://github.com/ipython/ipython/pull/7201>`__,
    `#7204 <https://github.com/ipython/ipython/pull/7204>`__).

docs/source/whatsnew/version5.rst

@@ -87,7 +87,7 b' Define ``_repr_mimebundle_``'
 Object can now define `_repr_mimebundle_` in place of multiple `_repr_*_`
 methods and return a full mimebundle. This greatly simplify many implementation
 and allow to publish custom mimetypes (like geojson, plotly, dataframes....).
-See the ``Cutom Display Logic`` example notebook for more informations.
+See the ``Custom Display Logic`` example notebook for more information.
 
 Execution Heuristics
 --------------------

examples/IPython Kernel/Custom Display Logic.ipynb

@@ -739,7 +739,7 b''
     "        \n",
     "    def _repr_mimebundle_(self, include, exclude, **kwargs):\n",
     "        \"\"\"\n",
-    "        repr_mimebundle shoudl accept include, exclude and **kwargs\n",
+    "        repr_mimebundle should accept include, exclude and **kwargs\n",
     "        \"\"\"\n",
     "        if self._png_data is None:\n",
     "            self._png_data = self._figure_data('png')\n",
@@ -777,7 +777,7 b''
     }
    ],
    "source": [
-    "# that is deffinitively wrong as it shoudl show the PNG. \n",
+    "# that is definitively wrong as it should show the PNG. \n",
     "display(Gaussian())"
    ]
   },

examples/IPython Kernel/Plotting in the Notebook.ipynb

@@ -2602,7 +2602,7 b''
        "    // Register the callback with on_msg.\n",
        "    comm.on_msg(function(msg) {\n",
        "        //console.log('receiving', msg['content']['data'], msg);\n",
-       "        // Pass the mpl event to the overriden (by mpl) onmessage function.\n",
+       "        // Pass the mpl event to the overridden (by mpl) onmessage function.\n",
        "        ws.onmessage(msg['content']['data'])\n",
        "    });\n",
        "    return ws;\n",

examples/IPython Kernel/Rich Output.ipynb

@@ -660,7 +660,7 b''
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Here is the embedded version. Note that this image was pulled from the webcam when this code cell was originally run and stored in the Notebook. Unless we rerun this cell, this is not todays image."
+    "Here is the embedded version. Note that this image was pulled from the webcam when this code cell was originally run and stored in the Notebook. Unless we rerun this cell, this is not today's image."
    ]
   },
   {

tools/gen_latex_symbols.py

@@ -3,7 +3,7 b''
 # This script autogenerates `IPython.core.latex_symbols.py`, which contains a
 # single dict , named `latex_symbols`. The keys in this dict are latex symbols,
 # such as `\\alpha` and the values in the dict are the unicode equivalents for
-# those. Most importantly, only unicode symbols that are valid identifers in
+# those. Most importantly, only unicode symbols that are valid identifiers in
 # Python 3 are included. 
 
 # 

tools/git-mpr.py

@@ -23,7 +23,7 b' def merge_branch(repo, branch ):'
     
     If something does not goes smoothly, merge is aborted
     
-    Returns True if merge sucessfull, False otherwise
+    Returns True if merge successful, False otherwise
     """
     # Delete the branch first
     try :