Sourcery suggested refactorings

tcrudge/decorators.py

@@ -13,11 +13,7 @@ async def func(self, *args, **kw):
             auth = await self.is_auth()
             if auth:
                 roles = await self.get_roles()
-                valid_permission = False
-                for r in roles:
-                    if r in items:
-                        valid_permission = True
-                        break
+                valid_permission = any(r in items for r in roles)
                 if not valid_permission:
                     await self.bad_permissions()
                 return await f(self, *args, **kw)

tcrudge/handlers.py

@@ -568,12 +568,11 @@ async def _get_items(self, qs):
                 items, total = await multi(awaitables)
                 # Set total items number
                 pagination['total'] = total
+            elif self.prefetch_queries:
+                items = await self.application.objects.prefetch(qs,
+                                                                *self.prefetch_queries)                    
             else:
-                if self.prefetch_queries:
-                    items = await self.application.objects.prefetch(qs,
-                                                                    *self.prefetch_queries)
-                else:
-                    items = await self.application.objects.execute(qs)
+                items = await self.application.objects.execute(qs)
         except (peewee.DataError, ValueError) as e:
             # Bad parameters
             raise HTTPError(

tcrudge/utils/schema.py

@@ -218,10 +218,10 @@ def _get_properties(self, recurse=True):
         if not recurse:
             return dict(self._properties)
 
-        properties = {}
-        for prop, subschema in self._properties.items():
-            properties[prop] = subschema.to_dict()
-        return properties
+        return {
+            prop: subschema.to_dict()
+            for prop, subschema in self._properties.items()
+        }
 
     def _get_items(self, recurse=True):
         if not recurse:
@@ -294,8 +294,5 @@ def _generate_array(self, array):
         self._add_items(array, 'add_object')
 
     def _generate_basic(self, val):
-        if val in JS_TYPES.keys():
-            val_type = JS_TYPES[val]
-        else:
-            val_type = JS_TYPES[type(val)]
+        val_type = JS_TYPES[val] if val in JS_TYPES.keys() else JS_TYPES[type(val)]
         self._add_type(val_type)