← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to weavefile.py

  • Committer: Martin Pool
  • Date: 2005-07-07 07:57:12 UTC
  • mto: This revision was merged to the branch mainline in revision 852.
  • Revision ID: mbp@sourcefrog.net-20050707075712-4784aa908809b905
- preliminary merge conflict detection

Show diffs side-by-side

added added

removed removed

Lines of Context:
weavefile.py
144
144
        if l == 'W\n':
145
145
            break
146
146
        elif l.startswith('. '):
147
 
            w._l.append(l[2:])           # include newline
 
147
            w._l.append(intern(l[2:]))  # include newline
148
148
        elif l.startswith(', '):
149
149
            w._l.append(l[2:-1])        # exclude newline
150
150
        else:
151
151
            assert l[0] in '{}[]', l
152
152
            assert l[1] == ' ', l
153
 
            w._l.append((l[0], int(l[2:])))
 
153
            w._l.append((intern(l[0]), int(l[2:])))
154
154
 
155
155
    return w
156
156