aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/http/status_codes.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-09-28 13:53:59 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-09-28 13:53:59 +0200
commit67229fbdf7be2f3bb591a9da77f75c05ed0ab269 (patch)
treeaa94ff2eacbe2c5d46dbad3f41c9ca2eae849f73 /netlib/http/status_codes.py
parent5261bcdf4b0976b8db3295292143282b34f10c51 (diff)
parent23d13e4c1282bc46c54222479c3b83032dad3335 (diff)
downloadmitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.tar.gz
mitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.tar.bz2
mitmproxy-67229fbdf7be2f3bb591a9da77f75c05ed0ab269.zip
Merge branch 'http-models'
Diffstat (limited to 'netlib/http/status_codes.py')
-rw-r--r--netlib/http/status_codes.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/netlib/http/status_codes.py b/netlib/http/status_codes.py
index dc09f465..8a4dc1f5 100644
--- a/netlib/http/status_codes.py
+++ b/netlib/http/status_codes.py
@@ -1,4 +1,4 @@
-from __future__ import (absolute_import, print_function, division)
+from __future__ import absolute_import, print_function, division
CONTINUE = 100
SWITCHING = 101
@@ -37,6 +37,7 @@ REQUEST_URI_TOO_LONG = 414
UNSUPPORTED_MEDIA_TYPE = 415
REQUESTED_RANGE_NOT_SATISFIABLE = 416
EXPECTATION_FAILED = 417
+IM_A_TEAPOT = 418
INTERNAL_SERVER_ERROR = 500
NOT_IMPLEMENTED = 501
@@ -91,6 +92,7 @@ RESPONSES = {
UNSUPPORTED_MEDIA_TYPE: "Unsupported Media Type",
REQUESTED_RANGE_NOT_SATISFIABLE: "Requested Range not satisfiable",
EXPECTATION_FAILED: "Expectation Failed",
+ IM_A_TEAPOT: "I'm a teapot",
# 500
INTERNAL_SERVER_ERROR: "Internal Server Error",