Fix R1705.

The codebase appears to have this pattern like:

if foo == bar:
  return a
elif foo == baz:
  return b
else:
  return c

This can often be rewritten as:
if foo == bar:
  return a
if foo == baz:
  return b
return c

Closes: https://github.com/gentoo/portage/pull/592
Signed-off-by: Alec Warner <antarus@gentoo.org>
Signed-off-by: Zac Medico <zmedico@gentoo.org>

1 files changed, 2 insertions, 3 deletions

diff --git a/lib/portage/glsa.py b/lib/portage/glsa.py
index ecbcde8f4..4066d6747 100644
--- a/lib/portage/glsa.py
+++ b/lib/portage/glsa.py
@@ -293,10 +293,9 @@ def match(atom, dbapi, match_type="default"):
 	"""
 	if atom[2] == "~":
 		return revisionMatch(atom, dbapi, match_type=match_type)
-	elif match_type == "default" or not hasattr(dbapi, "xmatch"):
+	if match_type == "default" or not hasattr(dbapi, "xmatch"):
 		return dbapi.match(atom)
-	else:
-		return dbapi.xmatch(match_type, atom)
+	return dbapi.xmatch(match_type, atom)
 
 def revisionMatch(revisionAtom, dbapi, match_type="default"):
 	"""