Merge lp:~jelmer/brz/lgtm into lp:brz

[Jelmer Vernooij]

Fix some issues reported by lgtm.com.

Fix some issues reported by lgtm.com.

[Martin Packman (gz)]

Thanks!

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/272/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/279/

=== modified file 'breezy/bundle/serializer/v08.py'
--- breezy/bundle/serializer/v08.py	2018-11-29 23:42:41 +0000
+++ breezy/bundle/serializer/v08.py	2019-04-13 22:15:31 +0000
@@ -78,10 +78,7 @@
             if len(prop) == 1:
                 p_texts.append(prop[0])
             else:
-                try:
-                    p_texts.append('%s:%s' % prop)
-                except:
-                    raise repr(prop)
+                p_texts.append('%s:%s' % prop)
         text = ['=== ']
         text.append(' // '.join(p_texts))
         text_line = ''.join(text).encode('utf-8')
 
=== modified file 'breezy/bzr/_knit_load_data_py.py'
--- breezy/bzr/_knit_load_data_py.py	2018-11-11 04:08:32 +0000
+++ breezy/bzr/_knit_load_data_py.py	2019-04-13 22:15:31 +0000
@@ -64,7 +64,6 @@
             raise KnitCorrupt(kndx._filename, "line %r: %s" % (rec, e))
 
         version_id, options, pos, size = rec[:4]
-        version_id = version_id
         try:
             pos = int(pos)
         except ValueError as e:
 
=== modified file 'breezy/bzr/knit.py'
--- breezy/bzr/knit.py	2018-11-12 01:41:38 +0000
+++ breezy/bzr/knit.py	2019-04-13 22:15:31 +0000
@@ -680,9 +680,6 @@
         lines = (tuple(line.split(b' ', 1)) for line in content)
         return AnnotatedKnitContent(lines)
 
-    def parse_line_delta_iter(self, lines):
-        return iter(self.parse_line_delta(lines))
-
     def parse_line_delta(self, lines, version_id, plain=False):
         """Convert a line based delta into internal representation.
 
 
=== modified file 'breezy/git/dir.py'
--- breezy/git/dir.py	2018-11-16 11:37:47 +0000
+++ breezy/git/dir.py	2019-04-13 22:15:31 +0000
@@ -273,11 +273,11 @@
         for ref in self.get_refs_container().keys():
             try:
                 branch_name = ref_to_branch_name(ref)
-            except ValueError:
-                continue
             except UnicodeDecodeError:
                 trace.warning("Ignoring branch %r with unicode error ref", ref)
                 continue
+            except ValueError:
+                continue
             ret[branch_name] = self.open_branch(ref=ref)
         return ret
 
 
=== modified file 'breezy/plugins/fastimport/helpers.py'
--- breezy/plugins/fastimport/helpers.py	2018-11-17 16:53:10 +0000
+++ breezy/plugins/fastimport/helpers.py	2019-04-13 22:15:31 +0000
@@ -102,8 +102,8 @@
         try:
             os.mkdir(location)
         except IOError as ex:
-            errors.BzrCommandError("Unable to create %s: %s" %
-                                   (location, ex))
+            raise errors.BzrCommandError(
+                "Unable to create %s: %s" % (location, ex))
 
     # Create a repository for the nominated format.
     trace.note("Creating destination repository ...")
 
=== modified file 'breezy/plugins/propose/launchpad.py'
--- breezy/plugins/propose/launchpad.py	2019-03-06 14:03:19 +0000
+++ breezy/plugins/propose/launchpad.py	2019-04-13 22:15:31 +0000
@@ -73,7 +73,7 @@
     if url.startswith('lp:'):
         return True
     regex = re.compile('([a-z]*\+)*(bzr\+ssh|http|ssh|git|https)'
-                       '://(bazaar|git).*.launchpad.net')
+                       '://(bazaar|git).*\.launchpad\.net')
     return bool(regex.match(url))
 
 
@@ -483,7 +483,7 @@
                         prerequisite_branch=None):
         """Perform the submission."""
         if labels:
-            raise LabelsUnsupported()
+            raise LabelsUnsupported(self)
         if prerequisite_branch is not None:
             prereq = self.launchpad.branches.getByUrl(
                 url=prerequisite_branch.user_url)
@@ -612,7 +612,7 @@
                         prerequisite_branch=None):
         """Perform the submission."""
         if labels:
-            raise LabelsUnsupported()
+            raise LabelsUnsupported(self)
         if prerequisite_branch is not None:
             (prereq_repo_lp, prereq_branch_lp) = (
                 self.lp_host._get_lp_git_ref_from_branch(prerequisite_branch))