From 9f9a414ebb1a4f540873c5ed28b5af96baa9fcc5 Mon Sep 17 00:00:00 2001
From: Tyler Hobbs <tyler@datastax.com>
Date: Thu, 29 May 2014 10:32:22 -0500
Subject: [PATCH 1/2] Add "six >=1.6" to requirements.txt

Fixes PYTHON-77
---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index b5cca97d..c067e65e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
 futures
+six >=1.6

From e64a45f5ee8335d42ba7775000ad10ab0556b4a0 Mon Sep 17 00:00:00 2001
From: Tyler Hobbs <tyler@datastax.com>
Date: Fri, 30 May 2014 16:50:05 -0500
Subject: [PATCH 2/2] Avoid KeyError in schema refresh when dropping keyspaces

---
 CHANGELOG.rst         | 9 +++++++++
 cassandra/metadata.py | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b42f9bad..311693f9 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,12 @@
+2.0.2
+=====
+
+Bug Fixes
+---------
+* Add six to requirements.txt
+* Avoid KeyError during schema refresh when a keyspace is dropped
+  and TokenAwarePolicy is not in use
+
 2.0.1
 =====
 May 28, 2014
diff --git a/cassandra/metadata.py b/cassandra/metadata.py
index 9597c418..3e3807ce 100644
--- a/cassandra/metadata.py
+++ b/cassandra/metadata.py
@@ -970,7 +970,7 @@ class TokenMap(object):
             return None
 
     def remove_keyspace(self, keyspace):
-        del self.tokens_to_hosts_by_ks[keyspace]
+        self.tokens_to_hosts_by_ks.pop(keyspace, None)
 
     def get_replicas(self, keyspace, token):
         """