merge review fperez-execution-refactor

IPython/core/interactiveshell.py

@@ -1565,7 +1565,6 b' class InteractiveShell(Configurable, Magic):'
 
     def _indent_current_str(self):
         """return the current level of indentation as a string"""
-        #return self.indent_current_nsp * ' '
         return self.input_splitter.indent_spaces * ' '
 
     #-------------------------------------------------------------------------

IPython/core/macro.py

@@ -20,7 +20,7 b' class Macro(IPyAutocall):'
     """
 
     def __init__(self,data):
-        # store the macro value, as a single string which can be executed
+        """store the macro value, as a single string which can be executed"""
         self.value = ''.join(data).rstrip()+'\n'
         
     def __str__(self):