← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/repository.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 10:58:39 UTC
  • mfrom: (6383 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6386.
  • Revision ID: jelmer@canonical.com-20111219105839-uji05ck4rkm1mj4j
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/repository.py
25
25
import gzip
26
26
import os
27
27
from cStringIO import StringIO
28
 
import urllib
29
28
 
30
29
from bzrlib.lazy_import import lazy_import
31
30
lazy_import(globals(), """
710
709
            raise errors.ObjectNotLocked(self)
711
710
        relpaths = set()
712
711
        for quoted_relpath in self._transport.iter_files_recursive():
713
 
            relpath = urllib.unquote(quoted_relpath)
 
712
            relpath = urlutils.unquote(quoted_relpath)
714
713
            path, ext = os.path.splitext(relpath)
715
714
            if ext == '.gz':
716
715
                relpath = path
750
749
            raise errors.ObjectNotLocked(self)
751
750
        relpaths = set()
752
751
        for quoted_relpath in self._transport.iter_files_recursive():
753
 
            relpath = urllib.unquote(quoted_relpath)
 
752
            relpath = urlutils.unquote(quoted_relpath)
754
753
            path, ext = os.path.splitext(relpath)
755
754
            if ext == '.gz':
756
755
                relpath = path