trivial: Combine if statements

Signed-off-by: Stephen Finucane <stephenfinucane@hotmail.com>
Reviewed-by: Daniel Axtens <dja@axtens.net>

diff --git a/patchwork/filters.py b/patchwork/filters.py
index faec89e1d01eb0862c3582d89152cd84d857c639..2664b948f27abff59d495a0c50dc741e58ba6c23 100644 (file)
--- a/patchwork/filters.py
+++ b/patchwork/filters.py
@@ -440,9 +440,8 @@ class Filters:
             if k not in params:
                 params[k] = v
 
-        if remove is not None:
-            if remove.param in list(params.keys()):
-                del params[remove.param]
+        if remove and remove.param in list(params.keys()):
+            del params[remove.param]
 
         def sanitise(s):
             if not isinstance(s, six.string_types):

diff --git a/patchwork/views/user.py b/patchwork/views/user.py
index 84896bd9f87b88f538e43efe7a5210c13afcecc9..691a4f93fc91b5ab6b36b7892434a651ac2e452a 100644 (file)
--- a/patchwork/views/user.py
+++ b/patchwork/views/user.py
@@ -184,10 +184,9 @@ def link_confirm(request, conf):
 def unlink(request, person_id):
     person = get_object_or_404(Person, id=person_id)
 
-    if request.method == 'POST':
-        if person.email != request.user.email:
-            person.user = None
-            person.save()
+    if request.method == 'POST' and person.email != request.user.email:
+        person.user = None
+        person.save()
 
     return HttpResponseRedirect(urlresolvers.reverse('user-profile'))
 

diff --git a/patchwork/views/xmlrpc.py b/patchwork/views/xmlrpc.py
index 1919ad920e4f10e5100e038e6687c87c0438cb20..cfb80d3acf02afa6ac155cb52fb5ce35cfe569bc 100644 (file)
--- a/patchwork/views/xmlrpc.py
+++ b/patchwork/views/xmlrpc.py
@@ -587,10 +587,9 @@ def patch_list(filt=None):
         if parts[0] not in ok_fields:
             # Invalid field given
             return []
-        if len(parts) > 1:
-            if LOOKUP_TYPES.count(parts[1]) == 0:
-                # Invalid lookup type given
-                return []
+        if len(parts) > 1 and LOOKUP_TYPES.count(parts[1]) == 0:
+            # Invalid lookup type given
+            return []
 
         try:
             if parts[0] == 'project_id':