Merge branch 'djv-master': partial fix for issue #678.

Now multiline structures pasted from doctests with input prompts work
in most regular cases.

IPython/core/inputsplitter.py

@@ -758,9 +758,11 b' class IPythonInputSplitter(InputSplitter):'
         
         try:
             push = super(IPythonInputSplitter, self).push
+            buf = self._buffer
             for line in lines_list:
-                if self._is_complete or not self._buffer or \
-                   (self._buffer and self._buffer[-1].rstrip().endswith(':')):
+                if self._is_complete or not buf or \
+                       (buf and (buf[-1].rstrip().endswith(':') or
+                                 buf[-1].rstrip().endswith(',')) ):
                     for f in transforms:
                         line = f(line)
 

IPython/core/tests/test_inputsplitter.py

@@ -534,6 +534,12 b' syntax_ml = \\'
           ('   ....: ', ''),
           ],
          ],
+
+       multiline_datastructure =
+       [ [('>>> a = [1,','a = [1,'),
+          ('... 2]','2]'),
+         ],
+       ],
        )