Refactor - clean

1 files changed, 15 insertions, 22 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 79fa8f6c0..bf8c8c19c 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -197,7 +197,7 @@ class ValueGetter(object):
                 val = ''
             elif (key in self.GET_VALUES_EXTRA_TYPES or "type" in key) and (
                   val.__class__.__name__.split('.')[0] == 'ManyRelatedManager'):
-                val = " ; ".join([str(v) for v in val.all()])
+                val = " ; ".join(str(v) for v in val.all())
             elif not isinstance(val, (tuple, list, dict)):
                 val = str(val)
                 if val.endswith('.None'):
@@ -219,10 +219,7 @@ class ValueGetter(object):
     def get_empty_values(cls, prefix=''):
         if not prefix:
             prefix = cls._prefix
-        values = {}
-        for field_name in get_all_field_names(cls):
-            values[prefix + field_name] = ''
-        return values
+        return {prefix + field_name: '' for field_name in get_all_field_names(cls)}
 
 
 class HistoryModel(models.Model):
@@ -296,7 +293,7 @@ class TinyUrl(models.Model):
 
     @classmethod
     def index_to_char(cls, seq):
-        return "".join([cls.CHAR_MAP[x] for x in seq])
+        return "".join(cls.CHAR_MAP[x] for x in seq)
 
     def get_short_id(self):
         c_id = self.id
@@ -348,7 +345,7 @@ class ImageModel(models.Model, ImageContainerModel):
             return True
         manager = getattr(self.__class__, 'objects')
         old = getattr(manager.get(pk=self.pk), field)
-        return not getattr(self, field) == old
+        return getattr(self, field) != old
 
     def create_thumb(self, image, size):
         """Returns the image resized to fit inside a box of the given size"""
@@ -2211,13 +2208,13 @@ class Person(Address, Merge, OwnPerms, ValueGetter, MainItem):
 
     @property
     def person_types_list(self):
-        return ", ".join([str(pt) for pt in self.person_types.all()])
+        return ", ".join(str(pt) for pt in self.person_types.all())
 
     profiles_list_lbl = _("Profiles")
 
     @property
     def profiles_list(self):
-        return ", ".join([str(p) for p in self.profiles.all()])
+        return ", ".join(str(p) for p in self.profiles.all())
 
     def generate_merge_key(self):
         if self.name and self.name.strip():
@@ -2389,8 +2386,7 @@ class UserProfile(models.Model):
         lbl = self.name or str(self.profile_type)
         if not self.areas.count():
             return lbl
-        return "{} ({})".format(lbl, ", ".join(
-            [str(area) for area in self.areas.all()]))
+        return "{} ({})".format(lbl, ", ".join(str(area) for area in self.areas.all()))
 
     @property
     def query_towns(self):
@@ -2403,7 +2399,7 @@ class UserProfile(models.Model):
 
     @property
     def area_labels(self):
-        return ", ".join([str(area) for area in self.areas.all()])
+        return ", ".join(str(area) for area in self.areas.all())
 
     def duplicate(self, **kwargs):
         areas = [area for area in self.areas.all()]
@@ -2574,8 +2570,7 @@ class IshtarUser(FullSearch):
         person = Person.objects.create(surname=surname,
                                        name=name, email=email,
                                        history_modifier=user)
-        isht_user = cls.objects.create(user_ptr=user, person=person)
-        return isht_user
+        return cls.objects.create(user_ptr=user, person=person)
 
     def has_right(self, right_name, session=None):
         return self.person.has_right(right_name, session=session)
@@ -2685,13 +2680,11 @@ class Basket(FullSearch, OwnPerms, ValueGetter, TemplateItem):
         :param ishtaruser: if provided an alternate user is used
         :return: the new basket
         """
-        items = []
         through = self.items.through
         basket_pk = "{}_id".format(self.SLUG)
         item_pk = "{}_id".format(self.items.model.SLUG)
         q = through.objects.filter(**{basket_pk: self.pk})
-        for r in q.values("pk", item_pk).order_by("pk").all():
-            items.append(r[item_pk])
+        items = [r[item_pk] for r in q.values("pk", item_pk).order_by("pk").all()]
         new_item = self
         new_item.pk = None
         if ishtaruser:
@@ -3693,7 +3686,7 @@ class Document(BaseHistorizedItem, CompleteIdentifierItem, OwnPerms, ImageModel,
                     "content": self.creation_date.strftime("%Y-%m-%d")}
             tags.append(("meta", date))
         if self.tags.count():
-            content = ", ".join([str(t) for t in self.tags.all()])
+            content = ", ".join(str(t) for t in self.tags.all())
             tg = {"name": "DC.subject", "content": content}
             tags.append(("meta", tg))
         if self.description:
@@ -3705,8 +3698,8 @@ class Document(BaseHistorizedItem, CompleteIdentifierItem, OwnPerms, ImageModel,
                 ("meta", {"name": "DC.publisher",
                           "content": self.publisher.name}))
         if self.authors.count():
-            content = ", ".join([str(t.person.raw_name) for t in
-                                 self.authors.all()])
+            content = ", ".join(str(t.person.raw_name) for t in
+                                         self.authors.all())
             tags.append(
                 ("meta", {"name": "DC.creator",
                           "content": content}))
@@ -3729,7 +3722,7 @@ class Document(BaseHistorizedItem, CompleteIdentifierItem, OwnPerms, ImageModel,
                 ("meta", {"name": "DC.language",
                           "content": lang}))
         if self.licenses.count():
-            licences = ", ".join([str(l) for l in self.licenses.all()])
+            licences = ", ".join(str(l) for l in self.licenses.all())
             tags.append(
                 ("meta", {"name": "DC.rights",
                           "content": licences}))
@@ -3806,7 +3799,7 @@ class Document(BaseHistorizedItem, CompleteIdentifierItem, OwnPerms, ImageModel,
         if self.isbn:
             info.append(("rft.isbn", self.isbn))
         if self.licenses.count():
-            licenses = ";".join([str(l) for l in self.licenses.all()])
+            licenses = ";".join(str(l) for l in self.licenses.all())
             info.append(("rft.rights", licenses))
         if self.language:
             info.append(("rft.language", self.language.iso_code))