~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/rio.py

  • Committer: Aaron Bentley
  • Date: 2007-03-02 16:00:33 UTC
  • mto: (2323.6.9 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2330.
  • Revision ID: abentley@panoramicfeedback.com-20070302160033-24rk2wsej7212y0f
Fix handling of whitespace-stripping without newline munging

Show diffs side-by-side

added added

removed removed

Lines of Context:
358
358
 
359
359
    last_line = None
360
360
    for line in line_iter:
361
 
        assert line.startswith('#')
362
 
        line = line[2:]
 
361
        if line.startswith('# '):
 
362
            line = line[2:]
 
363
        else:
 
364
            assert line.startswith('#')
 
365
            line = line[1:]
363
366
        line = re.sub('\r', '', line)
364
367
        line = re.sub('\\\\(.|\n)', mapget, line)
365
368
        if last_line is None: