Code cleanup

refinery/core/api.py

@@ -121,16 +121,18 @@ def transform_res_list(self, user, res_list, request, **kwargs):
         owned_res_set = Set(
             get_objects_for_user(
                 user,
-                'core.share_%s' % self.res_type._meta.verbose_name).values_list( "id", flat=True))
+                'core.share_%s' %
+                self.res_type._meta.verbose_name).values_list("id", flat=True))
         public_res_set = Set(
             get_objects_for_group(
                 ExtendedGroup.objects.public_group(),
-                'core.read_%s' % self.res_type._meta.verbose_name).values_list( "id", flat=True))
+                'core.read_%s' %
+                self.res_type._meta.verbose_name).values_list("id", flat=True))
 
         # instantiate owner and public fields
         for res in res_list:
-            setattr(res, 'is_owner', res.id in owned_res_set )
-            setattr(res, 'public', res.id in public_res_set )
+            setattr(res, 'is_owner', res.id in owned_res_set)
+            setattr(res, 'public', res.id in public_res_set)
 
             if 'sharing' in kwargs and kwargs['sharing']:
                 setattr(res, 'share_list', self.get_share_list(user, res))
@@ -191,7 +193,7 @@ def obj_get(self, bundle, **kwargs):
         user = request.user
 
         if not res:
-            return HttpBadRequest() 
+            return HttpBadRequest()
 
         # User not authenticated, res is not public.
         if not user.is_authenticated() and res and not res.is_public():
@@ -230,7 +232,7 @@ def res_sharing(self, request, **kwargs):
         user = request.user
 
         if not res:
-            return HttpBadRequest() 
+            return HttpBadRequest()
 
         # User not authenticated, res is not public.
         if not user.is_authenticated() and res and not res.is_public():
@@ -630,6 +632,7 @@ def dehydrate(self, bundle):
     #     return super(NodeResource, self).get_object_list(request).filter(
     #         uuid__in=[node['uuid'] for node in allowed_nodes])
 
+
 class NodeSetResource(ModelResource):
     # https://github.com/toastdriven/django-tastypie/pull/538
     # https://github.com/toastdriven/django-tastypie/issues/526
@@ -1107,8 +1110,8 @@ def group_members(self, request, **kwargs):
             return self.process_get(request, group_obj, **kwargs)
         elif request.method == 'PATCH':
             if not self.user_authorized(user, group):
-                 return HttpUnauthorized()
-                 
+                return HttpUnauthorized()
+
             data = json.loads(request.raw_post_data)
             new_member_list = data['member_list']
 
@@ -1144,7 +1147,7 @@ def group_members(self, request, **kwargs):
     def group_members_detail(self, request, **kwargs):
         group = self.get_group(kwargs['id'])
         user = request.user
- 
+
         if not user.is_authenticated():
             return HttpUnauthorized()
 
@@ -1373,7 +1376,6 @@ def update_db(self, request, **kwargs):
 
         return HttpNoContent()
 
-
     def email_token(self, request, **kwargs):
         self.update_db(request, **kwargs)
 
@@ -1385,7 +1387,7 @@ def email_token(self, request, **kwargs):
 
         get_token_response = self.get_token(request, **kwargs)
 
-        if type(get_token_response) is type(HttpUnauthorized()):
+        if isinstance(get_token_response, HttpUnauthorized):
             return HttpUnauthorized()
 
         token = get_token_response.content

refinery/core/models.py

@@ -537,7 +537,7 @@ def delete_associated_externaltoolstatus(sender, instance, **kwargs):
         externaltool.delete()
     except:
         logger.error(
-            "There's no ExternalToolStatus with that unique instance identifier"
+            "There's no ExternalToolStatus with the unique instance identifier"
         )
 
 
@@ -1204,7 +1204,7 @@ def get_or_create_user(self, username, ldap_user):
         # to get email address from an attribute in ldap_user
         if created:
             try:
-                email_attribute_name = settings.AUTH_LDAP_USER_ATTR_MAP['email']
+                email_attr_name = settings.AUTH_LDAP_USER_ATTR_MAP['email']
             except KeyError:
                 logger.error(
                     "Cannot send welcome email to user '{}': key 'email' does "
@@ -1213,12 +1213,12 @@ def get_or_create_user(self, username, ldap_user):
                 )
                 return user, created
             try:
-                email_address_list = ldap_user.attrs.data[email_attribute_name]
+                email_address_list = ldap_user.attrs.data[email_attr_name]
             except KeyError:
                 logger.error(
                     "Cannot send welcome email to user '{}': attribute '{}'"
                     " was not provided by the LDAP server"
-                    .format(username, email_attribute_name)
+                    .format(username, email_attr_name)
                 )
                 return user, created
             try:
@@ -1372,7 +1372,7 @@ def __init__(
         self.is_admin = is_admin
         self.id = id
         self.username = username
-        
+
 
 class Invitation(models.Model):
     token_uuid = UUIDField(unique=True, auto=True)
@@ -1385,8 +1385,8 @@ def __unicode__(self):
 
     def save(self, *arg, **kwargs):
         if not self.id:
-          self.created = datetime.now()
-        
+            self.created = datetime.now()
+
         return super(Invitation, self).save(*arg, **kwargs)