[sysadmin-bin] Minor fixes

[Andrea Veri <av src gnome org>]

commit 8bd60b57d127be0f6d3cb432f3ba7b12b54e5c16
Author: Andrea Veri <averi redhat com>
Date:   Thu Nov 9 09:43:15 2017 +0100

    Minor fixes

 membership/foundation-operations.py |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/membership/foundation-operations.py b/membership/foundation-operations.py
index 4578055..5205921 100755
--- a/membership/foundation-operations.py
+++ b/membership/foundation-operations.py
@@ -52,7 +52,7 @@ foundationmembers = glu.get_uids_from_group('foundation')
 
 
 def send_renewal_emails():
-    today = str(today)
+    _today = str(today)
 
     for member in foundationmembers:
         ldap_fields = glu.get_attributes_from_ldap(member, 'FirstAdded', 'LastRenewedOn', 'mail', 'cn')
@@ -63,10 +63,10 @@ def send_renewal_emails():
         common_name_attr = ldap_fields[4]
         userid_attr = ldap_fields[0]
 
-        if (first_added_attr and last_renewed_on):
-            if (last_renewed_on_attr == today) and (first_added_attr == today):
+        if (first_added_attr and last_renewed_on_attr):
+            if (last_renewed_on_attr == _today) and (first_added_attr == _today):
                 send_form_letters(new_member_form_letter, mail_attr, common_name_attr, userid_attr)
-            elif last_renewed_on_attr == today:
+            elif last_renewed_on_attr == _today:
                 send_form_letters(renewal_form_letter, mail_attr, common_name_attr)
 
 
@@ -138,7 +138,7 @@ def send_form_letters(form_letter, email, name, *args):
         elif form_letter is renewal_form_letter:
             msg = MIMEText(form_letter.safe_substitute(cn=name),
                            'plain', 'utf8')
-        elif form_letter is (expired_membership_form_letter or close_to_expire_membership_form_letter):
+        elif form_letter in (expired_membership_form_letter, close_to_expire_membership_form_letter):
             msg = MIMEText(form_letter.safe_substitute(cn=name, 
                            last_renewed_on_date=args[0]), 'plain', 'utf8')
         elif form_letter is renewals_to_foundation_list:
@@ -162,6 +162,8 @@ def send_form_letters(form_letter, email, name, *args):
 
 
 def subscribe_new_members():
+    _today = str(today)
+
     if socket.gethostname() != 'restaurant.gnome.org':
         sys.exit("This function should only be used on restaurant.gnome.org")
 
@@ -173,9 +175,9 @@ def subscribe_new_members():
         last_renewed_on_attr = ldap_fields[2]
         mail_attr = ldap_fields[3]
 
-        if first_added_attr == TODAY:
+        if first_added_attr == _today:
             f.write(str(mail_attr) + '\n')
-        elif last_renewed_on_attr == TODAY:
+        elif last_renewed_on_attr == _today:
             f.write(str(mail_attr) + '\n')
         else:
             pass