Fixed some pep8 and pyflakes stuff. Added more data keyword testing

Author: palewire

documentcloud/__init__.py

@@ -123,7 +123,7 @@ def put(self, method, params):
                     urllib.parse.quote_plus(key.encode("utf-8")),
                     urllib.parse.quote_plus(value.encode("utf-8"))
                 ) for key, value in
-                string_data.items()
+                data.items()
             ])
         else:
             # Otherwise, we can just use the vanilla urllib prep method
@@ -629,6 +629,7 @@ def validate_value(self, value):
         if not isinstance(value, six.string_types):
             raise TypeError("data attribute values must be strings")
 
+
 class Document(BaseAPIObject):
     """
     A document returned by the API.

tests/test_all.py

@@ -346,6 +346,17 @@ def test_private_actions(self):
             self.assertRaises(ValueError, setattr, obj, "data", {key: 'foo'})
         obj.data = dict(boom='bap')
 
+        # Test to make sure non-strings can't get into the data dictionary
+        with self.assertRaises(TypeError):
+            obj.data = dict(a=1)
+
+        with self.assertRaises(TypeError):
+            obj.data = {1: 'a'}
+
+        obj.data = dict(boom='bap')
+        with self.assertRaises(TypeError):
+            obj.data[1] = 2
+
         # Resources
         self.assertEqual(obj.published_url, obj.resources.published_url)
         self.assertEqual(obj.related_article, obj.resources.related_article)