From d4494bae509a0e9e391caab8b5551d535c8e0d59 Mon Sep 17 00:00:00 2001
From: Kevin McCarthy <me@kevinmccarthy.org>
Date: Thu, 19 Dec 2013 19:34:06 -1000
Subject: [PATCH] Let's have the new exceptions subclass basic exception types

---
 tests/unit/test_cassettes.py |  3 ++-
 vcr/cassette.py              |  5 +----
 vcr/errors.py                | 10 ++++++++++
 vcr/stubs/__init__.py        |  5 +----
 4 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 vcr/errors.py

diff --git a/tests/unit/test_cassettes.py b/tests/unit/test_cassettes.py
index 4d7cbe4..d351ab0 100644
--- a/tests/unit/test_cassettes.py
+++ b/tests/unit/test_cassettes.py
@@ -1,7 +1,8 @@
 import pytest
 import yaml
 import mock
-from vcr.cassette import Cassette, UnhandledHTTPRequestError
+from vcr.cassette import Cassette
+from vcr.errors import UnhandledHTTPRequestError
 
 
 def test_cassette_load(tmpdir):
diff --git a/vcr/cassette.py b/vcr/cassette.py
index 20b9da6..b68209d 100644
--- a/vcr/cassette.py
+++ b/vcr/cassette.py
@@ -13,10 +13,7 @@ from .patch import install, reset
 from .persist import load_cassette, save_cassette
 from .serializers import yamlserializer
 from .matchers import requests_match, url, method
-
-
-class UnhandledHTTPRequestError(Exception):
-    pass
+from .errors import UnhandledHTTPRequestError
 
 
 class Cassette(ContextDecorator):
diff --git a/vcr/errors.py b/vcr/errors.py
new file mode 100644
index 0000000..1b40f91
--- /dev/null
+++ b/vcr/errors.py
@@ -0,0 +1,10 @@
+class CannotOverwriteExistingCassetteException(Exception):
+    pass
+
+
+class UnhandledHTTPRequestError(KeyError):
+    '''
+    Raised when a cassette does not c
+    ontain the request we want
+    '''
+    pass
diff --git a/vcr/stubs/__init__.py b/vcr/stubs/__init__.py
index c02ac54..1404f85 100644
--- a/vcr/stubs/__init__.py
+++ b/vcr/stubs/__init__.py
@@ -4,10 +4,7 @@ from httplib import HTTPConnection, HTTPSConnection, HTTPMessage
 from cStringIO import StringIO
 
 from vcr.request import Request
-
-
-class CannotOverwriteExistingCassetteException(Exception):
-    pass
+from vcr.errors import CannotOverwriteExistingCassetteException
 
 
 def parse_headers(header_list):