/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/bundle/__init__.py

merge bzr.dev r4054

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
17
18
from bzrlib.lazy_import import lazy_import
18
19
lazy_import(globals(), """
19
20
from bzrlib import (
29
30
from bzrlib.trace import note
30
31
 
31
32
 
 
33
@deprecated_function(deprecated_in((1, 12, 0)))
32
34
def read_bundle_from_url(url):
33
35
    return read_mergeable_from_url(url, _do_directive=False)
34
36
 
90
92
        # doesn't always fail at get() time. Sometimes it fails
91
93
        # during read. And that raises a generic IOError with
92
94
        # just the string 'Failure'
93
 
        # StubSFTPServer does fail during get() (because of prefetch) 
 
95
        # StubSFTPServer does fail during get() (because of prefetch)
94
96
        # so it has an opportunity to translate the error.
95
97
        raise errors.NotABundle(str(e))
96
98
    except errors.NotAMergeDirective: