← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-11 04:02:41 UTC
  • mfrom: (5017.2.2 tariff)
  • Revision ID: pqm@pqm.ubuntu.com-20100211040241-w6n021dz0uus341n
(mbp) add import-tariff tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
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