Changeset 142

Show
Ignore:
Timestamp:
Thu Dec 7 08:58:07 2006
Author:
jpellerin
Message:

Simplified fix for #95

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/nose/inspector.py

    r140 r142  
    33 33          
    34 34     # figure out the set of lines to grab.  
    35       working = True  
    36 35     inspect_lines, mark_line = find_inspectable_lines(lines, exc_line)  
    37       while inspect_lines and working:  
      36     while inspect_lines:  
    37 36         src = StringIO(textwrap.dedent(''.join(inspect_lines)))  
    38    
    39 37         exp = Expander(frame.f_locals, frame.f_globals)  
    40 38         try:  
    …… 
    49 47             mark_line -= 1  
    50 48             continue  
    51    
    52           working = False  
    53           padded = []  
    54           if exp.expanded_source:  
    55               exp_lines = exp.expanded_source.split('\n')  
    56               ep = 0  
    57               for line in exp_lines:  
    58                   if ep == mark_line:  
    59                       padded.append('>>  ' + line)  
    60                   else:  
    61                       padded.append('    ' + line)  
    62                   ep += 1  
      49         break  
      50     padded = []  
      51     if exp.expanded_source:  
      52         exp_lines = exp.expanded_source.split('\n')  
      53         ep = 0  
      54         for line in exp_lines:  
      55             if ep == mark_line:  
      56                 padded.append('>>  ' + line)  
      57             else:  
      58                 padded.append('    ' + line)  
      59             ep += 1  
    63 60     return '\n'.join(padded)  
    64 61