@@ -80,7 +80,7 @@ def _get_user_badge_info(request, user):
80
80
81
81
# Get rank. (same code found in leaderboard view function)
82
82
rank = user .rank or 0
83
- user_count = request .db .session .query (m .Person ).filter (not m .Person .opt_out ).count ()
83
+ user_count = request .db .session .query (m .Person ).filter (m .Person .opt_out . is_ ( False ) ).count ()
84
84
85
85
try :
86
86
percentile = (
@@ -393,7 +393,7 @@ def index(request):
393
393
latest_awards = (
394
394
request .db .get_all_assertions ()
395
395
.join (m .Person )
396
- .filter (not m .Person .opt_out )
396
+ .filter (m .Person .opt_out . is_ ( False ) )
397
397
.order_by (sa .desc (m .Assertion .issued_on ))
398
398
.limit (n )
399
399
.all ()
@@ -494,13 +494,13 @@ def leaderboard(request):
494
494
m .Person .rank ,
495
495
m .Person .created_on ,
496
496
)
497
- .filter (not m .Person .opt_out )
497
+ .filter (m .Person .opt_out . is_ ( False ) )
498
498
)
499
499
500
- leaderboard = query .filter (m .Person .rank is not None ).all ()
500
+ leaderboard = query .filter (m .Person .rank . isnot ( None ) ).all ()
501
501
# Get total user count.
502
502
user_count = len (leaderboard )
503
- leaderboard .extend (query .filter (m .Person .rank is None ).all ())
503
+ leaderboard .extend (query .filter (m .Person .rank . is_ ( None ) ).all ())
504
504
505
505
user_to_rank = request .db ._make_leaderboard ()
506
506
@@ -554,13 +554,13 @@ def leaderboard_json(request):
554
554
m .Person .rank ,
555
555
m .Person .created_on ,
556
556
)
557
- .filter (not m .Person .opt_out )
557
+ .filter (m .Person .opt_out . is_ ( False ) )
558
558
)
559
559
560
- leaderboard = query .filter (m .Person .rank is not None ).all ()
560
+ leaderboard = query .filter (m .Person .rank . isnot ( None ) ).all ()
561
561
# Get total user count.
562
562
# user_count = len(leaderboard)
563
- leaderboard .extend (query .filter (m .Person .rank is None ).all ())
563
+ leaderboard .extend (query .filter (m .Person .rank . is_ ( None ) ).all ())
564
564
565
565
user_to_rank = request .db ._make_leaderboard ()
566
566
@@ -626,7 +626,7 @@ def explore(request):
626
626
(m .Person .nickname .like ("%" + search_query + "%" ))
627
627
| (m .Person .bio .like ("%" + search_query + "%" ))
628
628
)
629
- & (not m .Person .opt_out )
629
+ & (m .Person .opt_out . is_ ( False ) )
630
630
)
631
631
.all ()
632
632
)
@@ -655,10 +655,10 @@ def explore(request):
655
655
# Get some random persons (for discovery).
656
656
try :
657
657
random_persons = random .sample (
658
- request .db .get_all_persons ().filter (not m .Person .opt_out ).all (), 5
658
+ request .db .get_all_persons ().filter (m .Person .opt_out . is_ ( False ) ).all (), 5
659
659
)
660
660
except ValueError : # the sample is probably larger than the population
661
- random_persons = request .db .get_all_persons ().filter (not m .Person .opt_out ).all ()
661
+ random_persons = request .db .get_all_persons ().filter (m .Person .opt_out . is_ ( False ) ).all ()
662
662
663
663
return dict (
664
664
auth_principals = request .effective_principals ,
@@ -1217,7 +1217,7 @@ def diff(request):
1217
1217
# Get rank. (same code found in leaderboard view function)
1218
1218
user_a_rank = user_a .rank
1219
1219
user_b_rank = user_b .rank
1220
- user_count = request .db .session .query (m .Person ).filter (not m .Person .opt_out ).count ()
1220
+ user_count = request .db .session .query (m .Person ).filter (m .Person .opt_out . is_ ( False ) ).count ()
1221
1221
1222
1222
try :
1223
1223
user_a_percentile = (float (user_a_rank ) / float (user_count )) * 100
0 commit comments