From: Stephen Finucane Date: Fri, 9 Sep 2016 16:19:30 +0000 (+0100) Subject: trivial: Combine if statements X-Git-Tag: v2.0.0-rc1~228 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f29650753fe345744bb351de6c8f2ca80b6b408;p=thirdparty%2Fpatchwork.git trivial: Combine if statements Signed-off-by: Stephen Finucane Reviewed-by: Daniel Axtens --- diff --git a/patchwork/filters.py b/patchwork/filters.py index faec89e1..2664b948 100644 --- 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 84896bd9..691a4f93 100644 --- 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 1919ad92..cfb80d3a 100644 --- 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':