[sysadmin-bin] More py3 compatibility changes



commit 3c5fbc999185023bae8c5a19738749533936686f
Author: Andrea Veri <averi redhat com>
Date:   Thu Nov 12 22:08:40 2020 +0100

    More py3 compatibility changes

 membership/foundation-operations.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/membership/foundation-operations.py b/membership/foundation-operations.py
index 1ddbe01..ff98707 100755
--- a/membership/foundation-operations.py
+++ b/membership/foundation-operations.py
@@ -122,19 +122,17 @@ def generate_membership_list():
 
     for member in foundationmembers:
         ldap_fields = glu.get_attributes_from_ldap(member, 'cn', 'LastRenewedOn')
-        common_name_attr = ldap_fields[1]
-        last_renewed_on_attr = ldap_fields[2]
+        common_name_attr = ldap_fields[1].decode('utf-8')
+        last_renewed_on_attr = ldap_fields[2].decode('utf-8')
 
         d = { 'common_name' : common_name_attr, 'last_renewed_on' : last_renewed_on_attr }
         result.append(d)
 
-    memberslist = json.dumps(result, ensure_ascii=False, encoding='utf8')
+    memberslist = json.dumps(result, ensure_ascii=False)
 
     if len(memberslist) > 0:
-        import codecs
-        membershipfile = codecs.open('/srv/http/www.gnome.org/html/membership/memberslist', 'w', 'utf8')
-        membershipfile.write(memberslist)
-        membershipfile.close()
+        with open('/srv/http/www.gnome.org/html/membership/memberslist', 'w') as membershipfile:
+            membershipfile.write(memberslist)
 
 
 def send_form_letters(form_letter, email, name, *args):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]