further py3 fixups

web/webapp/admin.py

@@ -28,9 +28,8 @@ def index():
             member['color'] = "E0941B"
         else:
             member['color'] = "FF0000"
-
-    active_members = filter(lambda m: m['judgement'], members)
-    inactive_members = filter(lambda m: not m['judgement'], members)
+    active_members = list(filter(lambda m: m['judgement'], members))
+    inactive_members = list(filter(lambda m: not m['judgement'], members))
     diff = directory.get_ldap_group_diff(members)
     if diff is not None:
         flash("LDAP sync required")
@@ -247,10 +246,10 @@ def sendspam():
         payment_policy=models.PaymentPolicy.normal.value).all()
 
     members = [(m, m.get_status()) for m in members]
-    members.sort(key=lambda m, s: -(s['months_due'] or 0))
+    members.sort(key=lambda m: (-m[1]['months_due'] or 0))
 
     form = forms.SpamForm()
-    form.members.choices = [(member.id, member) for member, status in members if status['months_due'] or status['judgement']]
+    form.members.choices = [(member.id, str(member)) for member, status in members if status['months_due'] or status['judgement']]
     form.members.default = [member.id for member, status in members if status['months_due'] > 1]
 
     form.process(request.form)
@@ -281,12 +280,12 @@ def sendspam():
         if form.dry_run.data:
             readable = [
                 msg.as_string().split('\n\n')[0] + '\n\n'
-                + msg.get_payload(decode=True) for msg in spam]
-            return Response('\n====\n'.join(readable), mimetype='text/text')
+                + msg.get_payload(decode=True).decode('utf-8') for msg in spam]
+            return Response('\n====\n'.join(readable), mimetype='text/plain')
 
         for msg in spam:
             p = Popen(["/usr/sbin/sendmail", "-t"], stdin=PIPE)
-            p.communicate(msg.as_string())
+            p.communicate(msg.as_bytes())
 
         flash('%d messages sent!' % len(spam))
         return redirect(url_for('.index'))

web/webapp/models.py

@@ -350,7 +350,7 @@ class Member(db.Model):
         self.join_month = now_date.month
         self.payment_policy = PaymentPolicy.normal.value
 
-    def __unicode__(self):
+    def __str__(self):
         return self.username
 
     def __repr__(self):

web/webapp/templates/admin_index.html

@@ -27,11 +27,11 @@
 		{% endfor %}
 		<div class="col-md-6">
 		    <h2>Inactive-wannabes:</h2>
-            {{ members_list(inactive_members|selectattr("months_due")) }}
+            {{ members_list(inactive_members|rejectattr("left")) }}
 		</div>
 		<div class="col-md-6">
             <h2>Inactive members:</h2>
-            {{ members_list(inactive_members|rejectattr("months_due")) }}
+            {{ members_list(inactive_members|selectattr("left")) }}
         </div>
         {% endblock %}
         </div>