← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockable_files.py

Merge fetch-spec-everything-not-in-other.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockable_files.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from StringIO import StringIO
18
 
 
19
17
import bzrlib
20
18
from bzrlib import (
21
19
    errors,
23
21
    osutils,
24
22
    transport,
25
23
    )
26
 
from bzrlib.errors import BzrBadParameterNotString, NoSuchFile, ReadOnlyError
27
24
from bzrlib.lockable_files import LockableFiles, TransportLock
28
 
from bzrlib.symbol_versioning import (
29
 
    deprecated_in,
30
 
    )
31
25
from bzrlib.tests import (
32
26
    TestCaseInTempDir,
33
27
    TestNotApplicable,