Fix for \ at end of comment, and add tests

IPython/core/inputsplitter.py

@@ -545,9 +545,9 b' class IPythonInputSplitter(InputSplitter):'
     def transforms_in_use(self):
         """Transformers, excluding logical line transformers if we're in a
         Python line."""
-        t = self.physical_line_transforms + [self.assemble_logical_lines]
+        t = self.physical_line_transforms[:]
         if not self.within_python_line:
-            t += self.logical_line_transforms
+            t += [self.assemble_logical_lines] + self.logical_line_transforms
         return t + [self.assemble_python_lines] + self.python_line_transforms
 
     def reset(self):
@@ -556,6 +556,7 b' class IPythonInputSplitter(InputSplitter):'
         self._buffer_raw[:] = []
         self.source_raw = ''
         self.transformer_accumulating = False
+        self.within_python_line = False
         for t in self.transforms:
             t.reset()
     
@@ -685,11 +686,11 b' class IPythonInputSplitter(InputSplitter):'
             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')
         
-        if not self.within_python_line:
             for transformer in self.logical_line_transforms:
                 line = transformer.push(line)
                 if line is None:

IPython/core/inputtransformer.py

@@ -180,10 +180,12 b' def assemble_logical_lines():'
         
         parts = []
         while line is not None:
-            parts.append(line.rstrip('\\'))
-            if not line.endswith('\\'):
+            if line.endswith('\\') and (not has_comment(line)):
+                parts.append(line[:-1])
+                line = (yield None) # Get another line
+            else:
+                parts.append(line)
                 break
-            line = (yield None)
         
         # Output
         line = ' '.join(parts)

IPython/core/tests/test_inputtransformer.py

@@ -190,12 +190,19 b' syntax_ml = \\'
           ],
          ],
 
-       multiline_datastructure =
+       multiline_datastructure_prompt =
        [ [('>>> a = [1,','a = [1,'),
           ('... 2]','2]'),
          ],
        ],
        
+       multiline_datastructure =
+       [ [('b = ("%s"', None),
+          ('# comment', None),
+          ('%foo )', 'b = ("%s"\n# comment\n%foo )'),
+         ],
+       ],
+       
        leading_indent =
        [ [('    print "hi"','print "hi"'),
           ],
@@ -262,7 +269,7 b' def test_classic_prompt():'
     tt.check_pairs(transform_and_reset(ipt.classic_prompt), syntax['classic_prompt'])
     for example in syntax_ml['classic_prompt']:
         transform_checker(example, ipt.classic_prompt)
-    for example in syntax_ml['multiline_datastructure']:
+    for example in syntax_ml['multiline_datastructure_prompt']:
         transform_checker(example, ipt.classic_prompt)
 
 
@@ -280,6 +287,8 b' def test_assemble_logical_lines():'
        (u"12 *\\", None),
        (None, u"a =  12 *"),
       ],
+      [(u"# foo\\", u"# foo\\"), # Comments can't be continued like this
+      ],
     ]
     for example in tests:
         transform_checker(example, ipt.assemble_logical_lines)
@@ -300,7 +309,7 b' def test_assemble_python_lines():'
        (u"2,", None),
        (None, u"a = [1,\n2,"),
       ],
-    ]
+    ] + syntax_ml['multiline_datastructure']
     for example in tests:
         transform_checker(example, ipt.assemble_python_lines)