/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/github/hoster.py

  • Committer: Jelmer Vernooij
  • Date: 2020-08-10 15:00:17 UTC
  • mfrom: (7490.40.99 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200810150017-vs7xnrd1vat4iktg
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/github/hoster.py
275
275
            'Accept': 'application/vnd.github.v3+json'}
276
276
        if self._token:
277
277
            headers['Authorization'] = 'token %s' % self._token
278
 
        response = self.transport.request(
279
 
            method, urlutils.join(self.transport.base, path),
280
 
            headers=headers, body=body, retries=3)
 
278
        try:
 
279
            response = self.transport.request(
 
280
                method, urlutils.join(self.transport.base, path),
 
281
                headers=headers, body=body, retries=3)
 
282
        except UnexpectedHttpStatus as e:
 
283
            if e.code == 401:
 
284
                raise GitHubLoginRequired(self)
 
285
            else:
 
286
                raise
281
287
        if response.status == 401:
282
288
            raise GitHubLoginRequired(self)
283
289
        return response
561
567
        raise UnexpectedHttpStatus(path, response.status)
562
568
 
563
569
    def get_current_user(self):
564
 
        return self.current_user['login']
 
570
        if self._token is not None:
 
571
            return self.current_user['login']
 
572
        return None
565
573
 
566
574
    def get_user_url(self, username):
567
575
        return urlutils.join(self.base_url, username)