← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weavefile.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 14:14:48 UTC
  • mto: This revision was merged to the branch mainline in revision 6386.
  • Revision ID: jelmer@canonical.com-20111219141448-5gqopbmcubwv3m4w
Fix two more relative imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weavefile.py
89
89
 
90
90
def read_weave(f):
91
91
    # FIXME: detect the weave type and dispatch
92
 
    from bzrlib.trace import mutter
93
 
    from weave import Weave
 
92
    from bzrlib.weave import Weave
94
93
    w = Weave(getattr(f, 'name', None))
95
94
    _read_weave_v5(f, w)
96
95
    return w
115
114
    # +59363 0    311.8780    311.8780   +<method 'append' of 'list' objects>
116
115
    # +200   0     30.2500     30.2500   +<method 'readlines' of 'file' objects>
117
116
 
118
 
    from weave import WeaveFormatError
 
117
    from bzrlib.weave import WeaveFormatError
119
118
 
120
119
    try:
121
120
        lines = iter(f.readlines())