← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Martin
  • Date: 2011-05-21 16:29:38 UTC
  • mto: This revision was merged to the branch mainline in revision 5907.
  • Revision ID: gzlist@googlemail.com-20110521162938-1vrw3hp0197l3vrl
Add tests for non-ascii conflict serialisation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
54
54
                                       exclude_trailing_slash=False)
55
55
        if not filename:
56
56
            raise errors.NotABundle('A directory cannot be a bundle')
57
 
        return _mod_transport.get_transport_from_url(url)
 
57
        return _mod_transport.get_transport(url)
58
58
 
59
59
    try:
60
60
        bytef, transport = _mod_transport.do_catching_redirections(