Merge lp:~jelmer/brz/github-401s into lp:brz/3.1

[Jelmer Vernooij]

Raise UnexpectedHttpStatus rather than InvalidHttpResponse.

Raise UnexpectedHttpStatus rather than InvalidHttpResponse.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/plugins/github/hoster.py'
--- breezy/plugins/github/hoster.py	2020-07-30 18:45:47 +0000
+++ breezy/plugins/github/hoster.py	2020-07-30 21:38:23 +0000
@@ -280,9 +280,15 @@
             'Accept': 'application/vnd.github.v3+json'}
         if self._token:
             headers['Authorization'] = 'token %s' % self._token
-        response = self.transport.request(
-            method, urlutils.join(self.transport.base, path),
-            headers=headers, body=body, retries=3)
+        try:
+            response = self.transport.request(
+                method, urlutils.join(self.transport.base, path),
+                headers=headers, body=body, retries=3)
+        except UnexpectedHttpStatus as e:
+            if e.code == 401:
+                raise GitHubLoginRequired(self)
+            else:
+                raise
         if response.status == 401:
             raise GitHubLoginRequired(self)
         return response
 
=== modified file 'breezy/plugins/propose/cmds.py'
--- breezy/plugins/propose/cmds.py	2020-07-30 18:15:12 +0000
+++ breezy/plugins/propose/cmds.py	2020-07-30 21:38:23 +0000
@@ -37,7 +37,7 @@
     RegistryOption,
     )
 from ...sixish import text_type
-from ...trace import note
+from ...trace import note, warning
 from ... import (
     propose as _mod_propose,
     )
@@ -271,19 +271,22 @@
 
     def run(self, status='open', verbose=False):
         for instance in _mod_propose.iter_hoster_instances():
-            for mp in instance.iter_my_proposals(status=status):
-                self.outf.write('%s\n' % mp.url)
-                if verbose:
-                    self.outf.write(
-                        '(Merging %s into %s)\n' %
-                        (mp.get_source_branch_url(),
-                         mp.get_target_branch_url()))
-                    description = mp.get_description()
-                    if description:
-                        self.outf.writelines(
-                            ['\t%s\n' % l
-                             for l in description.splitlines()])
-                    self.outf.write('\n')
+            try:
+                for mp in instance.iter_my_proposals(status=status):
+                    self.outf.write('%s\n' % mp.url)
+                    if verbose:
+                        self.outf.write(
+                            '(Merging %s into %s)\n' %
+                            (mp.get_source_branch_url(),
+                             mp.get_target_branch_url()))
+                        description = mp.get_description()
+                        if description:
+                            self.outf.writelines(
+                                ['\t%s\n' % l
+                                 for l in description.splitlines()])
+                        self.outf.write('\n')
+            except _mod_propose.HosterLoginRequired as e:
+                warning('Skipping %r, login required.', instance)
 
 
 class cmd_land_merge_proposal(Command):
 
=== modified file 'breezy/transport/http/__init__.py'
--- breezy/transport/http/__init__.py	2020-07-28 01:24:51 +0000
+++ breezy/transport/http/__init__.py	2020-07-30 21:38:23 +0000
@@ -1865,9 +1865,9 @@
                 'Server refuses to fulfill the request (403 Forbidden)'
                 ' for %s' % req.get_full_url())
         else:
-            raise errors.InvalidHttpResponse(req.get_full_url(),
-                                             'Unable to handle http code %d: %s'
-                                             % (code, msg))
+            raise errors.UnexpectedHttpStatus(
+                req.get_full_url(), code,
+                'Unable to handle http code: %s' % msg)
 
 
 class Opener(object):