Fixed some deprecated things and bugs

Lucas Kanashiro
1 parent dd4560bd
Showing 2 changed files with 12 additions and 15 deletions Show diff stats
src/badger/management/commands/update_badges.py
src/super_archives/management/commands/import_emails.py
@@ -11,21 +11,13 @@ import logging
 class Command(BaseCommand):
     help = "Update the user's badges"
  
-    def search(self, object_type, **opts={}):
-        try:
-            sqs = SearchQuerySet().filter(type=object_type, **opts)
-        except Exception, e:
-            logging.except(e)
-            raise
-        return sqs
-
-    def handle(self, *args, **kwargs):
+    def update_badges(self):
         for badge in Badge.objects.filter(type='auto'):
             if not badge.comparison:
                 continue
             elif badge.comparison == 'biggest':
                 order = u'-{}'.format(Badge.USER_ATTR_OPTS[badge.user_attr])
-                sqs = self.search('user')
+                sqs = SearchQuerySet().filter(type='user')
                 user = sqs.order_by(order)[0]
                 badge.awardees.add(User.objects.get(pk=user.pk))
                 continue
@@ -39,7 +31,14 @@ class Command(BaseCommand):
             )
             opts = {key: badge.value}
  
-            sqs = self.search('user', **opts)
+            sqs = SearchQuerySet().filter(type='user', **opts)
  
             for user in sqs:
                 badge.awardees.add(User.objects.get(pk=user.pk))
+
+    def handle(self, *args, **kwargs):
+        try:
+            self.update_badges()
+        except Exception as e:
+            logging.exception(e)
+            raise
@@ -282,11 +282,9 @@ class Command(BaseCommand, object):
         try:
             self.import_emails(archives_path,
                            options.get('all'), options.get('exclude_lists'))
-        except Exception, e:
-            logging.except(e)
+        except Exception as e:
+            logging.exception(e)
             raise
         finally:
             os.remove(self.lock_file)
  
-        os.remove(self.lock_file)
-
...	...	@@ -11,21 +11,13 @@ import logging
11	11	class Command(BaseCommand):
12	12	help = "Update the user's badges"
13	13
14		- def search(self, object_type, **opts={}):
15		- try:
16		- sqs = SearchQuerySet().filter(type=object_type, **opts)
17		- except Exception, e:
18		- logging.except(e)
19		- raise
20		- return sqs
21		-
22		- def handle(self, args, *kwargs):
	14	+ def update_badges(self):
23	15	for badge in Badge.objects.filter(type='auto'):
24	16	if not badge.comparison:
25	17	continue
26	18	elif badge.comparison == 'biggest':
27	19	order = u'-{}'.format(Badge.USER_ATTR_OPTS[badge.user_attr])
28		- sqs = self.search('user')
	20	+ sqs = SearchQuerySet().filter(type='user')
29	21	user = sqs.order_by(order)[0]
30	22	badge.awardees.add(User.objects.get(pk=user.pk))
31	23	continue
...	...	@@ -39,7 +31,14 @@ class Command(BaseCommand):
39	31	)
40	32	opts = {key: badge.value}
41	33
42		- sqs = self.search('user', **opts)
	34	+ sqs = SearchQuerySet().filter(type='user', **opts)
43	35
44	36	for user in sqs:
45	37	badge.awardees.add(User.objects.get(pk=user.pk))
	38	+
	39	+ def handle(self, args, *kwargs):
	40	+ try:
	41	+ self.update_badges()
	42	+ except Exception as e:
	43	+ logging.exception(e)
	44	+ raise
...	...
...	...	@@ -282,11 +282,9 @@ class Command(BaseCommand, object):
282	282	try:
283	283	self.import_emails(archives_path,
284	284	options.get('all'), options.get('exclude_lists'))
285		- except Exception, e:
286		- logging.except(e)
	285	+ except Exception as e:
	286	+ logging.exception(e)
287	287	raise
288	288	finally:
289	289	os.remove(self.lock_file)
290	290
291		- os.remove(self.lock_file)
292		-
...	...