← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/gio_transport.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/gio_transport.py
23
23
It provides the gio+XXX:// protocols where XXX is any of the protocols
24
24
supported by gio.
25
25
"""
 
26
 
 
27
from __future__ import absolute_import
 
28
 
26
29
from cStringIO import StringIO
27
30
import os
28
31
import random
268
271
            else:
269
272
                self._translate_gio_error(e, relpath)
270
273
 
271
 
    def get(self, relpath, decode=DEPRECATED_PARAMETER, retries=0):
 
274
    def get(self, relpath, retries=0):
272
275
        """Get the file at the given relative path.
273
276
 
274
277
        :param relpath: The relative path to the file
278
281
        We're meant to return a file-like object which bzr will
279
282
        then read from. For now we do this via the magic of StringIO
280
283
        """
281
 
        if deprecated_passed(decode):
282
 
            warn(deprecated_in((2,3,0)) %
283
 
                 '"decode" parameter to GioTransport.get()',
284
 
                 DeprecationWarning, stacklevel=2)
285
284
        try:
286
285
            if 'gio' in debug.debug_flags:
287
286
                mutter("GIO get: %s" % relpath)