From ab1de7be2a9b7c2b4110d13de697ff8455fd1ce2 Mon Sep 17 00:00:00 2001 From: medmunds Date: Wed, 27 Mar 2013 11:07:40 -0700 Subject: [PATCH] (Don't use python builtin 'vars' as a parameter name) --- djrill/mail/backends/djrill.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/djrill/mail/backends/djrill.py b/djrill/mail/backends/djrill.py index 7a057a9..754d773 100644 --- a/djrill/mail/backends/djrill.py +++ b/djrill/mail/backends/djrill.py @@ -172,15 +172,14 @@ class DjrillBackend(BaseEmailBackend): for rcpt in sorted(message.recipient_metadata.keys()) ] - - def _expand_merge_vars(self, vars): + def _expand_merge_vars(self, vardict): """Convert a Python dict to an array of name-content used by Mandrill. { name: value, ... } --> [ {'name': name, 'content': value }, ... ] """ # For testing reproducibility, we sort the keys - return [ { 'name': name, 'content': vars[name] } - for name in sorted(vars.keys()) ] + return [{'name': name, 'content': vardict[name]} + for name in sorted(vardict.keys())] def _add_alternatives(self, message, msg_dict): """