From 38d2e6432c5e2224ab8dc28003c7eca990bb0150 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Mon, 6 Jun 2016 19:07:36 -0700
Subject: minor fixes

---
 mitmproxy/exceptions.py | 2 +-
 netlib/http/request.py  | 8 ++++----
 netlib/http/response.py | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mitmproxy/exceptions.py b/mitmproxy/exceptions.py
index d97b9498..63bd8d3d 100644
--- a/mitmproxy/exceptions.py
+++ b/mitmproxy/exceptions.py
@@ -93,5 +93,5 @@ class FlowReadException(ProxyException):
     pass
 
 
-class ControlException(Exception):
+class ControlException(ProxyException):
     pass
diff --git a/netlib/http/request.py b/netlib/http/request.py
index 91d5f020..01801d42 100644
--- a/netlib/http/request.py
+++ b/netlib/http/request.py
@@ -227,7 +227,7 @@ class Request(message.Message):
     def query(self):
         # type: () -> multidict.MultiDictView
         """
-        The request query string as an :py:class:`MultiDictView` object.
+        The request query string as an :py:class:`~netlib.multidict.MultiDictView` object.
         """
         return multidict.MultiDictView(
             self._get_query,
@@ -254,7 +254,7 @@ class Request(message.Message):
         """
         The request cookies.
 
-        An empty :py:class:`multidict.MultiDictView` object if the cookie monster ate them all.
+        An empty :py:class:`~netlib.multidict.MultiDictView` object if the cookie monster ate them all.
         """
         return multidict.MultiDictView(
             self._get_cookies,
@@ -329,7 +329,7 @@ class Request(message.Message):
     @property
     def urlencoded_form(self):
         """
-        The URL-encoded form data as an :py:class:`multidict.MultiDictView` object.
+        The URL-encoded form data as an :py:class:`~netlib.multidict.MultiDictView` object.
         An empty multidict.MultiDictView if the content-type indicates non-form data
         or the content could not be parsed.
         """
@@ -359,7 +359,7 @@ class Request(message.Message):
     @property
     def multipart_form(self):
         """
-        The multipart form data as an :py:class:`MultipartFormDict` object.
+        The multipart form data as an :py:class:`~netlib.multidict.MultiDictView` object.
         None if the content-type indicates non-form data.
         """
         return multidict.MultiDictView(
diff --git a/netlib/http/response.py b/netlib/http/response.py
index 44b58be6..7dabfcab 100644
--- a/netlib/http/response.py
+++ b/netlib/http/response.py
@@ -73,7 +73,7 @@ class Response(message.Message):
     def cookies(self):
         # type: () -> multidict.MultiDictView
         """
-        The response cookies. A possibly empty :py:class:`multidict.MultiDictView`, where the keys are
+        The response cookies. A possibly empty :py:class:`~netlib.multidict.MultiDictView`, where the keys are
         cookie name strings, and values are (value, attr) tuples. Value is a string, and attr is
         an ODictCaseless containing cookie attributes. Within attrs, unary attributes (e.g. HTTPOnly)
         are indicated by a Null value.
-- 
cgit v1.2.3