diff options
| author | Tom <tom@tomforb.es> | 2017-05-20 22:33:51 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-05-27 13:58:56 -0400 |
| commit | 94475aab800fc492853b67ada6b6b33d47554393 (patch) | |
| tree | 6758be293ee39ee813f8f18756bbe1dde1b3dc19 | |
| parent | 37ab3c3f9d707d6a1896db79c631e920dcb1fb78 (diff) | |
Replaced some map() and filter() calls with generators.
| -rw-r--r-- | django/core/mail/message.py | 4 | ||||
| -rw-r--r-- | django/template/loaders/cached.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/django/core/mail/message.py b/django/core/mail/message.py index 20432b05af..eb10ff1b73 100644 --- a/django/core/mail/message.py +++ b/django/core/mail/message.py @@ -256,9 +256,9 @@ class EmailMessage: msg['From'] = self.extra_headers.get('From', self.from_email) msg['To'] = self.extra_headers.get('To', ', '.join(map(str, self.to))) if self.cc: - msg['Cc'] = ', '.join(map(str, self.cc)) + msg['Cc'] = ', '.join(str(cc) for cc in self.cc) if self.reply_to: - msg['Reply-To'] = self.extra_headers.get('Reply-To', ', '.join(map(str, self.reply_to))) + msg['Reply-To'] = self.extra_headers.get('Reply-To', ', '.join(str(r) for r in self.reply_to)) # Email header names are case-insensitive (RFC 2045), so we have to # accommodate that when doing comparisons. diff --git a/django/template/loaders/cached.py b/django/template/loaders/cached.py index 20abe21b35..b0799a2d0e 100644 --- a/django/template/loaders/cached.py +++ b/django/template/loaders/cached.py @@ -85,7 +85,7 @@ class Loader(BaseLoader): if matching: skip_prefix = self.generate_hash(matching) - return '-'.join(filter(bool, [str(template_name), skip_prefix, dirs_prefix])) + return '-'.join(s for s in (str(template_name), skip_prefix, dirs_prefix) if s) def generate_hash(self, values): return hashlib.sha1(force_bytes('|'.join(values))).hexdigest() |