/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transport/fakenfs.py

  • Committer: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/fakenfs.py
24
24
 
25
25
from stat import S_ISDIR
26
26
 
27
 
from .. import (
 
27
from bzrlib import (
28
28
    errors,
29
29
    urlutils,
30
30
    )
31
 
from . import decorator
 
31
from bzrlib.transport import decorator
32
32
 
33
33
 
34
34
class FakeNFSTransportDecorator(decorator.TransportDecorator):
47
47
        """
48
48
        try:
49
49
            self._decorated.rename(rel_from, rel_to)
50
 
        except (errors.DirectoryNotEmpty, errors.FileExists) as e:
 
50
        except (errors.DirectoryNotEmpty, errors.FileExists), e:
51
51
            # if this is a directory rename, raise
52
52
            # resourcebusy rather than DirectoryNotEmpty
53
53
            stat = self._decorated.stat(rel_to)
64
64
 
65
65
def get_test_permutations():
66
66
    """Return the permutations to be used in testing."""
67
 
    from breezy.tests import test_server
68
 
    return [(FakeNFSTransportDecorator, test_server.FakeNFSServer), ]
 
67
    from bzrlib.tests import test_server
 
68
    return [(FakeNFSTransportDecorator, test_server.FakeNFSServer),]