comparison hgext/lfs/blobstore.py @ 41429:7df10ea7a5b8

py3: byteify the decoded JSON responses upon receipt in the LFS blobstore

It got too confusing juggling r'' vs b'' across several functions.

41428:4045ab21945a

            with contextlib.closing(self.urlopener.open(batchreq)) as rsp:
                rawjson = rsp.read()
        except util.urlerr.httperror as ex:
            hints = {
                400: _(b'check that lfs serving is enabled on %s and "%s" is '
                       'supported') % (self.baseurl, action),
                404: _(b'the "lfs.url" config may be used to override %s')
                       % self.baseurl,
            }
            hint = hints.get(ex.code, _(b'api=%s, action=%s') % (url, action))
            raise LfsRemoteError(

                          % pycompat.bytesurl(
                              json.dumps(response, indent=2,
                                         separators=(r'', r': '),
                                         sort_keys=True)))

        return response

    def _checkforservererror(self, pointers, responses, action):
        """Scans errors from objects

        Raises LfsRemoteError if any objects have an error"""

        localstore: blobstore.local

        See https://github.com/git-lfs/git-lfs/blob/master/docs/api/\
        basic-transfers.md
        """
        oid = pycompat.bytestr(obj['oid'])

        href = pycompat.bytestr(obj['actions'][action].get('href'))
        headers = obj['actions'][action].get('header', {}).items()

        request = util.urlreq.request(href)
        if action == b'upload':
            # If uploading blobs, read data from local blobstore.
            if not localstore.verify(oid):
                raise error.Abort(_(b'detected corrupt lfs object: %s') % oid,
                                  hint=_(b'run hg verify'))
            request.data = filewithprogress(localstore.open(oid), None)
            request.get_method = lambda: r'PUT'
            request.add_header(r'Content-Type', r'application/octet-stream')

        for k, v in headers:
            request.add_header(k, v)

        response = b''
        try:
            with contextlib.closing(self.urlopener.open(request)) as req:
                ui = self.ui  # Shorten debug lines

41429:7df10ea7a5b8

            with contextlib.closing(self.urlopener.open(batchreq)) as rsp:
                rawjson = rsp.read()
        except util.urlerr.httperror as ex:
            hints = {
                400: _(b'check that lfs serving is enabled on %s and "%s" is '
                       b'supported') % (self.baseurl, action),
                404: _(b'the "lfs.url" config may be used to override %s')
                       % self.baseurl,
            }
            hint = hints.get(ex.code, _(b'api=%s, action=%s') % (url, action))
            raise LfsRemoteError(

                          % pycompat.bytesurl(
                              json.dumps(response, indent=2,
                                         separators=(r'', r': '),
                                         sort_keys=True)))

        def encodestr(x):
            if isinstance(x, pycompat.unicode):
                return x.encode(u'utf-8')
            return x

        return pycompat.rapply(encodestr, response)

    def _checkforservererror(self, pointers, responses, action):
        """Scans errors from objects

        Raises LfsRemoteError if any objects have an error"""

        localstore: blobstore.local

        See https://github.com/git-lfs/git-lfs/blob/master/docs/api/\
        basic-transfers.md
        """
        oid = obj[b'oid']
        href = obj[b'actions'][action].get(b'href')
        headers = obj[b'actions'][action].get(b'header', {}).items()

        request = util.urlreq.request(pycompat.strurl(href))
        if action == b'upload':
            # If uploading blobs, read data from local blobstore.
            if not localstore.verify(oid):
                raise error.Abort(_(b'detected corrupt lfs object: %s') % oid,
                                  hint=_(b'run hg verify'))
            request.data = filewithprogress(localstore.open(oid), None)
            request.get_method = lambda: r'PUT'
            request.add_header(r'Content-Type', r'application/octet-stream')

        for k, v in headers:
            request.add_header(pycompat.strurl(k), pycompat.strurl(v))

        response = b''
        try:
            with contextlib.closing(self.urlopener.open(request)) as req:
                ui = self.ui  # Shorten debug lines