← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
36
36
import urllib
37
37
import urlparse
38
38
 
 
39
import bzrlib
39
40
import bzrlib.errors as errors
40
41
from bzrlib.errors import DependencyNotPresent
41
42
import bzrlib.osutils as osutils
 
43
from bzrlib.osutils import pumpfile
42
44
from bzrlib.symbol_versioning import *
43
45
from bzrlib.trace import mutter, warning
44
46
import bzrlib.urlutils as urlutils
220
222
        if isinstance(from_file, basestring):
221
223
            to_file.write(from_file)
222
224
        else:
223
 
            from bzrlib.osutils import pumpfile
224
225
            pumpfile(from_file, to_file)
225
226
 
226
227
    def _get_total(self, multi):