From a8edb5059db13e5a7856b26a9da2b017a1799326 Mon Sep 17 00:00:00 2001
From: Akihiro Motoki <amotoki@gmail.com>
Date: Sun, 2 Dec 2018 06:32:27 +0900
Subject: [PATCH] pylint: fix simplifiable-if-statement/expression

Change-Id: I9af66f886c47d3d2be61cba22b6c84460a178b8e
---
 .pylintrc                                                    | 2 --
 horizon/notifications.py                                     | 5 +----
 openstack_auth/user.py                                       | 5 +----
 openstack_dashboard/api/glance.py                            | 5 +----
 openstack_dashboard/api/rest/keystone.py                     | 2 +-
 openstack_dashboard/dashboards/admin/metadata_defs/views.py  | 3 +--
 .../dashboards/admin/networks/subnets/workflows.py           | 2 +-
 .../dashboards/project/networks/subnets/workflows.py         | 4 ++--
 8 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 5c0fe878fe..bfb25091c6 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -70,8 +70,6 @@ disable=
  no-else-return,
  no-self-use,
  redefined-argument-from-local,
- simplifiable-if-expression,
- simplifiable-if-statement,
  too-many-ancestors,
  too-many-arguments,
  too-many-branches,
diff --git a/horizon/notifications.py b/horizon/notifications.py
index 94ef4e798f..b8db56b5d4 100644
--- a/horizon/notifications.py
+++ b/horizon/notifications.py
@@ -106,10 +106,7 @@ class JSONMessage(object):
 
 
 def _is_path(path):
-    if os.path.exists(path) and os.path.isdir(path):
-        return True
-    else:
-        return False
+    return os.path.exists(path) and os.path.isdir(path)
 
 
 def _get_processed_messages(messages_path):
diff --git a/openstack_auth/user.py b/openstack_auth/user.py
index 4a5928a0a7..05f45ead56 100644
--- a/openstack_auth/user.py
+++ b/openstack_auth/user.py
@@ -264,10 +264,7 @@ class User(models.AbstractBaseUser, models.AnonymousUser):
     @property
     def is_authenticated(self):
         """Checks for a valid authentication."""
-        if (self.token is not None and utils.is_token_valid(self.token)):
-            return True
-        else:
-            return False
+        return self.token is not None and utils.is_token_valid(self.token)
 
     @property
     def is_anonymous(self):
diff --git a/openstack_dashboard/api/glance.py b/openstack_dashboard/api/glance.py
index 70794434a5..7d5e4bf39f 100644
--- a/openstack_dashboard/api/glance.py
+++ b/openstack_dashboard/api/glance.py
@@ -630,10 +630,7 @@ class Namespace(BaseGlanceMetadefAPIResourceWrapper):
 
     @property
     def public(self):
-        if getattr(self._apiresource, 'visibility') == 'public':
-            return True
-        else:
-            return False
+        return getattr(self._apiresource, 'visibility') == 'public'
 
 
 def filter_properties_target(namespaces_iter,
diff --git a/openstack_dashboard/api/rest/keystone.py b/openstack_dashboard/api/rest/keystone.py
index 8575ae8200..3060590a3d 100644
--- a/openstack_dashboard/api/rest/keystone.py
+++ b/openstack_dashboard/api/rest/keystone.py
@@ -424,7 +424,7 @@ class Projects(generic.View):
             filters = None
 
         paginate = request.GET.get('paginate') == 'true'
-        admin = False if request.GET.get('admin') == 'false' else True
+        admin = request.GET.get('admin') != 'false'
 
         result, has_more = api.keystone.tenant_list(
             request,
diff --git a/openstack_dashboard/dashboards/admin/metadata_defs/views.py b/openstack_dashboard/dashboards/admin/metadata_defs/views.py
index 495f0035cb..1a7e44f7dc 100644
--- a/openstack_dashboard/dashboards/admin/metadata_defs/views.py
+++ b/openstack_dashboard/dashboards/admin/metadata_defs/views.py
@@ -118,8 +118,7 @@ class UpdateView(forms.ModalFormView):
 
     def get_initial(self):
         namespace = self._get_object()
-        visibility = \
-            True if namespace['visibility'] == 'public' else False
+        visibility = namespace['visibility'] == 'public'
         return {'namespace_id': namespace['namespace'],
                 'public': visibility,
                 'protected': namespace['protected'],
diff --git a/openstack_dashboard/dashboards/admin/networks/subnets/workflows.py b/openstack_dashboard/dashboards/admin/networks/subnets/workflows.py
index cec55876a8..edc4622588 100644
--- a/openstack_dashboard/dashboards/admin/networks/subnets/workflows.py
+++ b/openstack_dashboard/dashboards/admin/networks/subnets/workflows.py
@@ -64,7 +64,7 @@ class CreateSubnet(project_workflows.CreateSubnet):
             request, data,
             network=network,
             tenant_id=network.tenant_id)
-        return True if subnet else False
+        return bool(subnet)
 
 
 class UpdateSubnetInfoAction(project_workflows.UpdateSubnetInfoAction):
diff --git a/openstack_dashboard/dashboards/project/networks/subnets/workflows.py b/openstack_dashboard/dashboards/project/networks/subnets/workflows.py
index 9e1ab9b3b4..707c0ad595 100644
--- a/openstack_dashboard/dashboards/project/networks/subnets/workflows.py
+++ b/openstack_dashboard/dashboards/project/networks/subnets/workflows.py
@@ -78,7 +78,7 @@ class CreateSubnet(network_workflows.CreateNetwork):
         network = self.context_seed['network']
         # network argument is required to show error message correctly.
         subnet = self._create_subnet(request, data, network=network)
-        return True if subnet else False
+        return bool(subnet)
 
 
 class UpdateSubnetInfoAction(CreateSubnetInfoAction):
@@ -202,4 +202,4 @@ class UpdateSubnet(network_workflows.CreateNetwork):
 
     def handle(self, request, data):
         subnet = self._update_subnet(request, data)
-        return True if subnet else False
+        return bool(subnet)