/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 breezy/plugins/propose/github.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-07-06 16:21:16 UTC
  • mfrom: (7359.1.5 propose-fixes)
  • Revision ID: breezy.the.bot@gmail.com-20190706162116-gypul33l15pj5rxb
Misc fixes for interacting with GitLab repositories.

Merged from https://code.launchpad.net/~jelmer/brz/propose-fixes/+merge/369487

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/propose/github.py
18
18
 
19
19
from __future__ import absolute_import
20
20
 
 
21
import json
21
22
import os
22
23
 
23
24
from .propose import (
195
196
        if response.status == 404:
196
197
            raise NoSuchProject(path)
197
198
        if response.status == 200:
198
 
            return response.json
 
199
            return json.loads(response.text)
199
200
        raise InvalidHttpResponse(path, response.text)
200
201
 
201
202
    def _get_user(self, username=None):
206
207
        response = self._api_request('GET', path)
207
208
        if response.status != 200:
208
209
            raise InvalidHttpResponse(path, response.text)
209
 
        return response.json
 
210
        return json.loads(response.text)
210
211
 
211
212
    def _get_organization(self, name):
212
213
        path = 'orgs/:%s' % name
213
214
        response = self._api_request('GET', path)
214
215
        if response.status != 200:
215
216
            raise InvalidHttpResponse(path, response.text)
216
 
        return response.json
 
217
        return json.loads(response.text)
217
218
 
218
219
    def _search_issues(self, query):
219
220
        path = 'search/issues'
221
222
            'GET', path + '?q=' + urlutils.quote(query))
222
223
        if response.status != 200:
223
224
            raise InvalidHttpResponse(path, response.text)
224
 
        return response.json
 
225
        return json.loads(response.text)
225
226
 
226
227
    def _create_fork(self, repo, owner=None):
227
228
        (orig_owner, orig_repo) = repo.split('/')
231
232
        response = self._api_request('POST', path)
232
233
        if response != 202:
233
234
            raise InvalidHttpResponse(path, response.text)
234
 
        return response.json
 
235
        return json.loads(response.text)
235
236
 
236
237
    @property
237
238
    def base_url(self):
362
363
        query.append('author:%s' % self._current_user['login'])
363
364
        for issue in self._search_issues(query=' '.join(query))['items']:
364
365
            yield GitHubMergeProposal(
365
 
                self.transport.request('GET', issue['pull_request']['url']).json)
 
366
                json.loads(self.transport.request('GET', issue['pull_request']['url']).text))
366
367
 
367
368
    def get_proposal_by_url(self, url):
368
369
        raise UnsupportedHoster(url)