← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Robert Collins
  • Date: 2010-06-28 02:41:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5324.
  • Revision ID: robertc@robertcollins.net-20100628024122-g951fzp74f3u6wst
Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
16
16
 
17
17
from cStringIO import StringIO
18
18
 
 
19
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
19
20
from bzrlib.lazy_import import lazy_import
20
21
lazy_import(globals(), """
21
22
from bzrlib import (
32
33
from bzrlib.trace import note
33
34
 
34
35
 
 
36
@deprecated_function(deprecated_in((1, 12, 0)))
 
37
def read_bundle_from_url(url):
 
38
    return read_mergeable_from_url(url, _do_directive=False)
 
39
 
 
40
 
35
41
def read_mergeable_from_url(url, _do_directive=True, possible_transports=None):
36
42
    """Read mergable object from a given URL.
37
43