← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_permissions.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_permissions.py
32
32
 
33
33
import os
34
34
import sys
35
 
import urllib
36
35
 
37
 
from bzrlib import transport
 
36
from bzrlib import urlutils
38
37
from bzrlib.branch import Branch
39
38
from bzrlib.bzrdir import BzrDir
40
39
from bzrlib.tests import TestCaseWithTransport, TestSkipped
68
67
        test.assertTransportMode(t, base, dir_mode)
69
68
    for root, dirs, files in os.walk(base):
70
69
        for d in dirs:
71
 
            p = '/'.join([urllib.quote(x) for x in root.split('/\\') + [d]])
 
70
            p = '/'.join([urlutils.quote(x) for x in root.split('/\\') + [d]])
72
71
            test.assertTransportMode(t, p, dir_mode)
73
72
        for f in files:
74
73
            p = os.path.join(root, f)
75
 
            p = '/'.join([urllib.quote(x) for x in root.split('/\\') + [f]])
 
74
            p = '/'.join([urlutils.quote(x) for x in root.split('/\\') + [f]])
76
75
            test.assertTransportMode(t, p, file_mode)
77
76
 
78
77