Using def function instead of lambda

Signed-off-by: Carlos Oliveira <carlospecter@gmail.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>

Using def function instead of lambda
Signed-off-by: Carlos Oliveira <carlospecter@gmail.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
Carlos Coêlho
1 parent 9475b27b
Showing 1 changed file with 12 additions and 9 deletions Show diff stats
colab/super_archives/models.py
@@ -134,6 +134,10 @@ class Thread(models.Model, HitCounterModelMixin):
     objects = NotSpamManager()
     tags = TaggableManager()
  
+    # Save this pseudo now to avoid calling the
+    #   function N times in the loops below
+    now = timezone.now()
+
     class Meta:
         verbose_name = _(u"Thread")
         verbose_name_plural = _(u"Threads")
@@ -182,6 +186,12 @@ class Thread(models.Model, HitCounterModelMixin):
                                  self.subject_token,
                                  self.message_set.count())
  
+    def _days_ago(self, date):
+        return (self.now - date).days
+
+    def _get_score(self, weight, created):
+        return max(weight - (self.days_ago(created) // 3), 5)
+
     def update_score(self):
         """Update the relevance score for this thread.
  
@@ -205,22 +215,15 @@ class Thread(models.Model, HitCounterModelMixin):
         if not self.subject_token:
             return
  
-        # Save this pseudo now to avoid calling the
-        #   function N times in the loops below
-        now = timezone.now()
-        days_ago = lambda date: (now - date).days
-        get_score = lambda weight, created: max(weight - (days_ago(created)
-                                                // 3), 5)
-
         vote_score = 0
         replies_score = 0
         for msg in self.message_set.all():
             # Calculate replies_score
-            replies_score += get_score(300, msg.received_time)
+            replies_score += self._get_score(300, msg.received_time)
  
             # Calculate vote_score
             for vote in msg.vote_set.all():
-                vote_score += get_score(100, vote.created)
+                vote_score += self._get_score(100, vote.created)
  
         # Calculate page_view_score
         page_view_score = self.hits * 10
...	...	@@ -134,6 +134,10 @@ class Thread(models.Model, HitCounterModelMixin):
134	134	objects = NotSpamManager()
135	135	tags = TaggableManager()
136	136
	137	+ # Save this pseudo now to avoid calling the
	138	+ # function N times in the loops below
	139	+ now = timezone.now()
	140	+
137	141	class Meta:
138	142	verbose_name = _(u"Thread")
139	143	verbose_name_plural = _(u"Threads")
...	...	@@ -182,6 +186,12 @@ class Thread(models.Model, HitCounterModelMixin):
182	186	self.subject_token,
183	187	self.message_set.count())
184	188
	189	+ def _days_ago(self, date):
	190	+ return (self.now - date).days
	191	+
	192	+ def _get_score(self, weight, created):
	193	+ return max(weight - (self.days_ago(created) // 3), 5)
	194	+
185	195	def update_score(self):
186	196	"""Update the relevance score for this thread.
187	197
...	...	@@ -205,22 +215,15 @@ class Thread(models.Model, HitCounterModelMixin):
205	215	if not self.subject_token:
206	216	return
207	217
208		- # Save this pseudo now to avoid calling the
209		- # function N times in the loops below
210		- now = timezone.now()
211		- days_ago = lambda date: (now - date).days
212		- get_score = lambda weight, created: max(weight - (days_ago(created)
213		- // 3), 5)
214		-
215	218	vote_score = 0
216	219	replies_score = 0
217	220	for msg in self.message_set.all():
218	221	# Calculate replies_score
219		- replies_score += get_score(300, msg.received_time)
	222	+ replies_score += self._get_score(300, msg.received_time)
220	223
221	224	# Calculate vote_score
222	225	for vote in msg.vote_set.all():
223		- vote_score += get_score(100, vote.created)
	226	+ vote_score += self._get_score(100, vote.created)
224	227
225	228	# Calculate page_view_score
226	229	page_view_score = self.hits * 10
...	...