From 4f286cec7a28169ac8939cc01aa6fdead47ac58e Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Mon, 20 Oct 2014 11:30:57 -0700
Subject: Handle non-iterable arguments reasonable

---
 cryptography/fernet.py | 1 +
 tests/test_fernet.py   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/cryptography/fernet.py b/cryptography/fernet.py
index 6bc401de..4f98feec 100644
--- a/cryptography/fernet.py
+++ b/cryptography/fernet.py
@@ -131,6 +131,7 @@ class Fernet(object):
 
 class MultiFernet(object):
     def __init__(self, fernets):
+        fernets = list(fernets)
         if not fernets:
             raise ValueError(
                 "MultiFernet requires at least one Fernet instance"
diff --git a/tests/test_fernet.py b/tests/test_fernet.py
index 91af32ad..58f89cbf 100644
--- a/tests/test_fernet.py
+++ b/tests/test_fernet.py
@@ -146,3 +146,7 @@ class TestMultiFernet(object):
     def test_no_fernets(self, backend):
         with pytest.raises(ValueError):
             MultiFernet([])
+
+    def test_non_iterable_argument(self, backend):
+        with pytest.raises(TypeError):
+            MultiFernet(None)
-- 
cgit v1.2.3