Merge pull request #60 from fedora-infra/feature/typofix2

Another typofix.

fmn/consumer/backends/mail.py

@@ -22,7 +22,7 @@
 
 reason = u"""
 You received this message due to your preference settings at
-{base_url}/{user}/email/{filter_id}
+{base_url}{user}/email/{filter_id}
 """
 
 
@@ -183,14 +183,14 @@ def handle_bad_email_address(self, session, recipient):
         self.log.warning("Dealing with bad email %s, %s" % (address, user))
         pref = self.preference_for(session, address)
         if address.endswith('@fedoraproject.org'):
-            fas_email = get_fas_email(user, **self.config)
+            fas_email = get_fas_email(self.config, user)
             self.log.info("Got fas email as %r " % fas_email)
             if fas_email != address:
-                pref.delete_details(address)
-                pref.update_details(fas_email)
+                pref.delete_details(session, address)
+                pref.update_details(session, fas_email)
             else:
                 self.log.warning("Disabling %s for good..." % user)
-                pref.disable()
+                pref.set_enabled(session, False)
         else:
             self.log.warning("Disabling %s for good..." % user)
-            pref.disable()
+            pref.set_enabled(session, False)

fmn/consumer/util.py

@@ -30,8 +30,8 @@ def get_fas_email(config, username):
     try:
         fas = fedora.client.AccountSystem(**config['fas_credentials'])
         person = fas.person_by_username(username)
-        if person.email:
-            return person.email
+        if person.get('email'):
+            return person['email']
         raise ValueError("No email found: %r, %r" % (person.email, username))
     except Exception:
         log.exception("Failed to get FAS email for %r" % username)