From 58a9c92d75bba2fa560633c60767331755af949f Mon Sep 17 00:00:00 2001
From: Raphael Deem <raphael.deem@gmail.com>
Date: Fri, 19 May 2017 13:35:04 -0700
Subject: [PATCH 1/7] fix 739

---
 sanic/exceptions.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sanic/exceptions.py b/sanic/exceptions.py
index a026575a..45c17ef0 100644
--- a/sanic/exceptions.py
+++ b/sanic/exceptions.py
@@ -1,3 +1,5 @@
+from sanic.response import ALL_STATUS_CODES
+
 TRACEBACK_STYLE = '''
     <style>
         body {
@@ -117,11 +119,13 @@ INTERNAL_SERVER_ERROR_HTML = '''
 
 class SanicException(Exception):
 
-    def __init__(self, message, status_code=None):
-        super().__init__(message)
-
+    def __init__(self, message=None, status_code=None):
         if status_code is not None:
             self.status_code = status_code
+            if message is None:
+                message = ALL_STATUS_CODES.get(status_code)
+
+        super().__init__(message)
 
 
 class NotFound(SanicException):

From d3b6208057bfab69073700ea7ded198f7f8c7bc1 Mon Sep 17 00:00:00 2001
From: Raphael Deem <raphael.deem@gmail.com>
Date: Fri, 19 May 2017 14:40:01 -0700
Subject: [PATCH 2/7] add abort function

---
 docs/sanic/exceptions.md | 13 +++++++++++++
 sanic/exceptions.py      | 37 +++++++++++++++++++++++++++++++------
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/docs/sanic/exceptions.md b/docs/sanic/exceptions.md
index cffa219c..6b68cd3e 100644
--- a/docs/sanic/exceptions.md
+++ b/docs/sanic/exceptions.md
@@ -17,6 +17,19 @@ def i_am_ready_to_die(request):
 	raise ServerError("Something bad happened", status_code=500)
 ```
 
+You can also use the `abort` function with the correct status code:
+
+```python
+from sanic.exceptions import abort
+from sanic.response import text
+
+@app.route('/youshallnotpass')
+def no_no(request):
+        abort(401)
+        # this won't happen
+        text("OK")
+```
+
 ## Handling exceptions
 
 To override Sanic's default handling of an exception, the `@app.exception`
diff --git a/sanic/exceptions.py b/sanic/exceptions.py
index 45c17ef0..989de72d 100644
--- a/sanic/exceptions.py
+++ b/sanic/exceptions.py
@@ -1,4 +1,4 @@
-from sanic.response import ALL_STATUS_CODES
+from sanic.response import ALL_STATUS_CODES, COMMON_STATUS_CODES
 
 TRACEBACK_STYLE = '''
     <style>
@@ -119,13 +119,11 @@ INTERNAL_SERVER_ERROR_HTML = '''
 
 class SanicException(Exception):
 
-    def __init__(self, message=None, status_code=None):
+    def __init__(self, message, status_code=None):
+        super().__init__(message)
+
         if status_code is not None:
             self.status_code = status_code
-            if message is None:
-                message = ALL_STATUS_CODES.get(status_code)
-
-        super().__init__(message)
 
 
 class NotFound(SanicException):
@@ -178,3 +176,30 @@ class ContentRangeError(SanicException):
 
 class InvalidRangeType(ContentRangeError):
     pass
+
+
+# Would be nice to define this at the top but the class is not defined yet
+# which is throwing an error.
+SANIC_EXCEPTIONS = {
+    400: InvalidUsage,
+    404: NotFound,
+    408: RequestTimeout,
+    413: PayloadTooLarge,
+    416: ContentRangeError,
+    500: ServerError,
+}
+
+
+def abort(status_code, message=None):
+    """
+    Raise an exception based on SanicException. Returns the HTTP response
+    message appropriate for the given status code, unless provided.
+    :param status_code: The HTTP status code to return.
+    :param message: The HTTP response body. Defaults to the messages
+    in response.py for the given status code.
+    """
+    if message is None:
+        message = COMMON_STATUS_CODES.get(status_code,
+                                          ALL_STATUS_CODES.get(status_code))
+    sanic_exception = SANIC_EXCEPTIONS.get(status_code, SanicException)
+    raise sanic_exception(message=message, status_code=status_code)

From 588b4712bfb71afebe91a34cd1d33c9a52ce16b1 Mon Sep 17 00:00:00 2001
From: Raphael Deem <raphael.deem@gmail.com>
Date: Sat, 20 May 2017 01:21:09 -0700
Subject: [PATCH 3/7] add exception decorator

---
 sanic/exceptions.py | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/sanic/exceptions.py b/sanic/exceptions.py
index 989de72d..3a501983 100644
--- a/sanic/exceptions.py
+++ b/sanic/exceptions.py
@@ -117,6 +117,20 @@ INTERNAL_SERVER_ERROR_HTML = '''
 '''
 
 
+SANIC_EXCEPTIONS = {}
+
+
+def add_status_code(code):
+    """
+    Decorator used for adding exceptions to SANIC_EXCEPTIONS.
+    """
+    def class_decorator(cls):
+        cls.status_code = code
+        SANIC_EXCEPTIONS[code] = cls
+        return cls
+    return class_decorator
+
+
 class SanicException(Exception):
 
     def __init__(self, message, status_code=None):
@@ -126,14 +140,17 @@ class SanicException(Exception):
             self.status_code = status_code
 
 
+@add_status_code(404)
 class NotFound(SanicException):
     status_code = 404
 
 
+@add_status_code(400)
 class InvalidUsage(SanicException):
     status_code = 400
 
 
+@add_status_code(500)
 class ServerError(SanicException):
     status_code = 500
 
@@ -151,10 +168,12 @@ class FileNotFound(NotFound):
         self.relative_url = relative_url
 
 
+@add_status_code(408)
 class RequestTimeout(SanicException):
     status_code = 408
 
 
+@add_status_code(413)
 class PayloadTooLarge(SanicException):
     status_code = 413
 
@@ -163,6 +182,7 @@ class HeaderNotFound(SanicException):
     status_code = 400
 
 
+@add_status_code(416)
 class ContentRangeError(SanicException):
     status_code = 416
 
@@ -178,18 +198,6 @@ class InvalidRangeType(ContentRangeError):
     pass
 
 
-# Would be nice to define this at the top but the class is not defined yet
-# which is throwing an error.
-SANIC_EXCEPTIONS = {
-    400: InvalidUsage,
-    404: NotFound,
-    408: RequestTimeout,
-    413: PayloadTooLarge,
-    416: ContentRangeError,
-    500: ServerError,
-}
-
-
 def abort(status_code, message=None):
     """
     Raise an exception based on SanicException. Returns the HTTP response

From f3186abf09bdf6d9eda0fb30002bb95ac064448c Mon Sep 17 00:00:00 2001
From: Raphael Deem <raphael.deem@gmail.com>
Date: Sat, 20 May 2017 10:29:00 -0700
Subject: [PATCH 4/7] SANIC_EXCEPTIONS -> _sanic_exceptions

---
 sanic/exceptions.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sanic/exceptions.py b/sanic/exceptions.py
index 3a501983..ca836647 100644
--- a/sanic/exceptions.py
+++ b/sanic/exceptions.py
@@ -117,16 +117,16 @@ INTERNAL_SERVER_ERROR_HTML = '''
 '''
 
 
-SANIC_EXCEPTIONS = {}
+_sanic_exceptions= {}
 
 
 def add_status_code(code):
     """
-    Decorator used for adding exceptions to SANIC_EXCEPTIONS.
+    Decorator used for adding exceptions to _sanic_exceptions.
     """
     def class_decorator(cls):
         cls.status_code = code
-        SANIC_EXCEPTIONS[code] = cls
+        _sanic_exceptions[code] = cls
         return cls
     return class_decorator
 
@@ -209,5 +209,5 @@ def abort(status_code, message=None):
     if message is None:
         message = COMMON_STATUS_CODES.get(status_code,
                                           ALL_STATUS_CODES.get(status_code))
-    sanic_exception = SANIC_EXCEPTIONS.get(status_code, SanicException)
+    sanic_exception = _sanic_exceptions.get(status_code, SanicException)
     raise sanic_exception(message=message, status_code=status_code)

From 1a60201f68b4a85b99ea916cf78bc22b0fd726d9 Mon Sep 17 00:00:00 2001
From: Raphael Deem <raphael.deem@gmail.com>
Date: Sat, 20 May 2017 10:44:09 -0700
Subject: [PATCH 5/7] flake8 spacing

---
 sanic/exceptions.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sanic/exceptions.py b/sanic/exceptions.py
index ca836647..ade2738d 100644
--- a/sanic/exceptions.py
+++ b/sanic/exceptions.py
@@ -117,7 +117,7 @@ INTERNAL_SERVER_ERROR_HTML = '''
 '''
 
 
-_sanic_exceptions= {}
+_sanic_exceptions = {}
 
 
 def add_status_code(code):

From 5d9c8d59a06a56ee92521a33c5ce20745c96e5a0 Mon Sep 17 00:00:00 2001
From: Raphael Deem <raphael.deem@gmail.com>
Date: Sat, 20 May 2017 14:43:57 -0700
Subject: [PATCH 6/7] add abort() test

---
 tests/test_exceptions.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py
index c557b202..a81d3444 100644
--- a/tests/test_exceptions.py
+++ b/tests/test_exceptions.py
@@ -30,6 +30,11 @@ def exception_app():
     def handler_invalid(request):
         raise InvalidUsage("OK")
 
+    @app.route('/abort')
+    def handler_invalid(request):
+        abort(500)
+        raise InvalidUsage("OK")
+
     @app.route('/divide_by_zero')
     def handle_unhandled_exception(request):
         1 / 0
@@ -73,10 +78,10 @@ def test_server_error_exception(exception_app):
     assert response.status == 500
 
 
-def test_invalid_usage_exception(exception_app):
+def test_abort(exception_app):
     """Test the built-in InvalidUsage exception works"""
-    request, response = exception_app.test_client.get('/invalid')
-    assert response.status == 400
+    request, response = exception_app.test_client.get('/abort')
+    assert response.status == 500
 
 
 def test_not_found_exception(exception_app):

From 9efa7c116dd8a3764922facd91564f097a6a3935 Mon Sep 17 00:00:00 2001
From: Raphael Deem <raphael.deem@gmail.com>
Date: Sat, 20 May 2017 19:30:08 -0700
Subject: [PATCH 7/7] remove redundant code; decode response

---
 docs/sanic/exceptions.md |  2 +-
 sanic/exceptions.py      | 24 +++++++++++++-----------
 tests/test_exceptions.py | 18 +++++++++++++-----
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/docs/sanic/exceptions.md b/docs/sanic/exceptions.md
index 6b68cd3e..4c0888f5 100644
--- a/docs/sanic/exceptions.md
+++ b/docs/sanic/exceptions.md
@@ -17,7 +17,7 @@ def i_am_ready_to_die(request):
 	raise ServerError("Something bad happened", status_code=500)
 ```
 
-You can also use the `abort` function with the correct status code:
+You can also use the `abort` function with the appropriate status code:
 
 ```python
 from sanic.exceptions import abort
diff --git a/sanic/exceptions.py b/sanic/exceptions.py
index ade2738d..e1136dd1 100644
--- a/sanic/exceptions.py
+++ b/sanic/exceptions.py
@@ -142,25 +142,25 @@ class SanicException(Exception):
 
 @add_status_code(404)
 class NotFound(SanicException):
-    status_code = 404
+    pass
 
 
 @add_status_code(400)
 class InvalidUsage(SanicException):
-    status_code = 400
+    pass
 
 
 @add_status_code(500)
 class ServerError(SanicException):
-    status_code = 500
+    pass
 
 
-class URLBuildError(SanicException):
-    status_code = 500
+class URLBuildError(ServerError):
+    pass
 
 
 class FileNotFound(NotFound):
-    status_code = 404
+    pass
 
     def __init__(self, message, path, relative_url):
         super().__init__(message)
@@ -170,21 +170,21 @@ class FileNotFound(NotFound):
 
 @add_status_code(408)
 class RequestTimeout(SanicException):
-    status_code = 408
+    pass
 
 
 @add_status_code(413)
 class PayloadTooLarge(SanicException):
-    status_code = 413
+    pass
 
 
-class HeaderNotFound(SanicException):
-    status_code = 400
+class HeaderNotFound(InvalidUsage):
+    pass
 
 
 @add_status_code(416)
 class ContentRangeError(SanicException):
-    status_code = 416
+    pass
 
     def __init__(self, message, content_range):
         super().__init__(message)
@@ -209,5 +209,7 @@ def abort(status_code, message=None):
     if message is None:
         message = COMMON_STATUS_CODES.get(status_code,
                                           ALL_STATUS_CODES.get(status_code))
+        # These are stored as bytes in the STATUS_CODES dict
+        message = message.decode('utf8')
     sanic_exception = _sanic_exceptions.get(status_code, SanicException)
     raise sanic_exception(message=message, status_code=status_code)
diff --git a/tests/test_exceptions.py b/tests/test_exceptions.py
index a81d3444..a2b8dc71 100644
--- a/tests/test_exceptions.py
+++ b/tests/test_exceptions.py
@@ -3,7 +3,7 @@ from bs4 import BeautifulSoup
 
 from sanic import Sanic
 from sanic.response import text
-from sanic.exceptions import InvalidUsage, ServerError, NotFound
+from sanic.exceptions import InvalidUsage, ServerError, NotFound, abort
 
 
 class SanicExceptionTestException(Exception):
@@ -33,7 +33,7 @@ def exception_app():
     @app.route('/abort')
     def handler_invalid(request):
         abort(500)
-        raise InvalidUsage("OK")
+        return text("OK")
 
     @app.route('/divide_by_zero')
     def handle_unhandled_exception(request):
@@ -65,6 +65,7 @@ def test_catch_exception_list():
     request, response = app.test_client.get('/')
     assert response.text == 'ok'
 
+
 def test_no_exception(exception_app):
     """Test that a route works without an exception"""
     request, response = exception_app.test_client.get('/')
@@ -78,10 +79,10 @@ def test_server_error_exception(exception_app):
     assert response.status == 500
 
 
-def test_abort(exception_app):
+def test_invalid_usage_exception(exception_app):
     """Test the built-in InvalidUsage exception works"""
-    request, response = exception_app.test_client.get('/abort')
-    assert response.status == 500
+    request, response = exception_app.test_client.get('/invalid')
+    assert response.status == 400
 
 
 def test_not_found_exception(exception_app):
@@ -102,6 +103,7 @@ def test_handled_unhandled_exception(exception_app):
         "The server encountered an internal error and "
         "cannot complete your request.")
 
+
 def test_exception_in_exception_handler(exception_app):
     """Test that an exception thrown in an error handler is handled"""
     request, response = exception_app.test_client.get(
@@ -126,3 +128,9 @@ def test_exception_in_exception_handler_debug_off(exception_app):
         debug=True)
     assert response.status == 500
     assert response.body.startswith(b'Exception raised in exception ')
+
+
+def test_abort(exception_app):
+    """Test the abort function"""
+    request, response = exception_app.test_client.get('/abort')
+    assert response.status == 500