~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lockable_files.py

  • Committer: John Arbash Meinel
  • Date: 2008-05-05 20:42:38 UTC
  • mfrom: (3406 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3407.
  • Revision ID: john@arbash-meinel.com-20080505204238-598hf62krc3wwcin
merge bzr.dev, resolve NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
import bzrlib.errors as errors
26
26
from bzrlib.errors import BzrError
27
27
from bzrlib.osutils import file_iterator, safe_unicode
28
 
from bzrlib.symbol_versioning import (deprecated_method,
29
 
        )
 
28
from bzrlib.symbol_versioning import (
 
29
    deprecated_in,
 
30
    deprecated_method,
 
31
    )
30
32
from bzrlib.trace import mutter, note
31
33
import bzrlib.transactions as transactions
32
34
import bzrlib.urlutils as urlutils
154
156
        return self._transport.get(relpath)
155
157
 
156
158
    @needs_read_lock
 
159
    @deprecated_method(deprecated_in((1, 5, 0)))
157
160
    def get_utf8(self, relpath):
158
161
        """Get a file as a unicode stream."""
159
162
        relpath = self._escape(relpath)