diff options
| author | ianb <devnull@localhost> | 2005-12-13 07:34:56 +0000 |
|---|---|---|
| committer | ianb <devnull@localhost> | 2005-12-13 07:34:56 +0000 |
| commit | 7e6f5e07a7ca05f7f5eb60dc0ed0f101d41e9c42 (patch) | |
| tree | 6d88b594e1483813b989c7b1899d15046c31dc19 /paste/httpexceptions.py | |
| parent | 4281398c872a2eb251e34a0d5fdc6af25e73434f (diff) | |
| download | paste-7e6f5e07a7ca05f7f5eb60dc0ed0f101d41e9c42.tar.gz | |
Fixed conflicts I accidentally committed
Diffstat (limited to 'paste/httpexceptions.py')
| -rw-r--r-- | paste/httpexceptions.py | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/paste/httpexceptions.py b/paste/httpexceptions.py index c38618c..5b64472 100644 --- a/paste/httpexceptions.py +++ b/paste/httpexceptions.py @@ -384,11 +384,7 @@ class HTTPNotAcceptable(HTTPClientError): 'acceptable to your browser (content\nof type ' '%(HTTP_ACCEPT)s).\n%(detail)s') -<<<<<<< .working -class HTTPConflict(HTTPException): -======= class HTTPConflict(HTTPClientError): ->>>>>>> .merge-right.r4008 code = 409 title = 'Conflict' explanation = ('There was a conflict when trying to complete ' @@ -460,15 +456,10 @@ class HTTPServerError(HTTPError): title = 'Internal Server Error' explanation = ('An internal server error occurred.') -<<<<<<< .working -class HTTPNotImplemented(HTTPException): - code = 501 -======= HTTPInternalServerError = HTTPServerError class HTTPNotImplemented(HTTPServerError): code = 501 ->>>>>>> .merge-right.r4008 title = 'Not Implemented' # override template since we need an environment variable template = ('The request method %(REQUEST_METHOD)s is not implemented ' |