Review tweaks

aholmberg · aholmberg · commit 253279e0c601 · 2015-03-12T14:48:50.000-05:00
PYTHON-231
diff --git a/cassandra/cqltypes.py b/cassandra/cqltypes.py
@@ -780,8 +780,8 @@ class MapType(_ParameterizedType):
 
     @classmethod
     def validate(cls, val):
-        key_type, subvaltype = cls.subtypes
-        return dict((key_type.validate(k), subvaltype.validate(v)) for (k, v) in six.iteritems(val))
+        key_type, value_type = cls.subtypes
+        return dict((key_type.validate(k), value_type.validate(v)) for (k, v) in six.iteritems(val))
 
     @classmethod
     def deserialize_safe(cls, byts, protocol_version):
diff --git a/tests/unit/test_policies.py b/tests/unit/test_policies.py
@@ -15,7 +15,7 @@
 try:
     import unittest2 as unittest
 except ImportError:
-    import unittest # noqa
+    import unittest  # noqa
 
 from itertools import islice, cycle
 from mock import Mock
@@ -139,7 +139,7 @@ def host_down():
             threads.append(Thread(target=host_down))
 
         # make the GIL switch after every instruction, maximizing
-        # the chace of race conditions
+        # the chance of race conditions
         check = six.PY2 or '__pypy__' in sys.builtin_module_names
         if check:
             original_interval = sys.getcheckinterval()
@@ -363,6 +363,7 @@ def test_default_dc(self):
         policy.on_add(host_remote)
         self.assertFalse(policy.local_dc)
 
+
 class TokenAwarePolicyTest(unittest.TestCase):
 
     def test_wrap_round_robin(self):
@@ -520,7 +521,6 @@ def test_status_updates(self):
         qplan = list(policy.make_query_plan())
         self.assertEqual(qplan, [])
 
-
     def test_statement_keyspace(self):
         hosts = [Host(str(i), SimpleConvictionPolicy) for i in range(4)]
         for host in hosts:
@@ -667,6 +667,7 @@ def test_schedule(self):
 
 ONE = ConsistencyLevel.ONE
 
+
 class RetryPolicyTest(unittest.TestCase):
 
     def test_read_timeout(self):
