From e236d7746a3780c4d14e57e1c1e6661bb7a3ef21 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sat, 23 Jun 2012 18:34:35 +1200
Subject: [PATCH] Move http.py to netlib.http_status

---
 libpathod/http.py   | 103 --------------------------------------------
 libpathod/rparse.py |   8 ++--
 2 files changed, 4 insertions(+), 107 deletions(-)
 delete mode 100644 libpathod/http.py

diff --git a/libpathod/http.py b/libpathod/http.py
deleted file mode 100644
index 9f3f7e15b..000000000
--- a/libpathod/http.py
+++ /dev/null
@@ -1,103 +0,0 @@
-
-CONTINUE                        = 100
-SWITCHING                       = 101
-OK                              = 200
-CREATED                         = 201
-ACCEPTED                        = 202
-NON_AUTHORITATIVE_INFORMATION   = 203
-NO_CONTENT                      = 204
-RESET_CONTENT                   = 205
-PARTIAL_CONTENT                 = 206
-MULTI_STATUS                    = 207
-
-MULTIPLE_CHOICE                 = 300
-MOVED_PERMANENTLY               = 301
-FOUND                           = 302
-SEE_OTHER                       = 303
-NOT_MODIFIED                    = 304
-USE_PROXY                       = 305
-TEMPORARY_REDIRECT              = 307
-
-BAD_REQUEST                     = 400
-UNAUTHORIZED                    = 401
-PAYMENT_REQUIRED                = 402
-FORBIDDEN                       = 403
-NOT_FOUND                       = 404
-NOT_ALLOWED                     = 405
-NOT_ACCEPTABLE                  = 406
-PROXY_AUTH_REQUIRED             = 407
-REQUEST_TIMEOUT                 = 408
-CONFLICT                        = 409
-GONE                            = 410
-LENGTH_REQUIRED                 = 411
-PRECONDITION_FAILED             = 412
-REQUEST_ENTITY_TOO_LARGE        = 413
-REQUEST_URI_TOO_LONG            = 414
-UNSUPPORTED_MEDIA_TYPE          = 415
-REQUESTED_RANGE_NOT_SATISFIABLE = 416
-EXPECTATION_FAILED              = 417
-
-INTERNAL_SERVER_ERROR           = 500
-NOT_IMPLEMENTED                 = 501
-BAD_GATEWAY                     = 502
-SERVICE_UNAVAILABLE             = 503
-GATEWAY_TIMEOUT                 = 504
-HTTP_VERSION_NOT_SUPPORTED      = 505
-INSUFFICIENT_STORAGE_SPACE      = 507
-NOT_EXTENDED                    = 510
-
-RESPONSES = {
-    # 100
-    CONTINUE: "Continue",
-    SWITCHING: "Switching Protocols",
-
-    # 200
-    OK: "OK",
-    CREATED: "Created",
-    ACCEPTED: "Accepted",
-    NON_AUTHORITATIVE_INFORMATION: "Non-Authoritative Information",
-    NO_CONTENT: "No Content",
-    RESET_CONTENT: "Reset Content.",
-    PARTIAL_CONTENT: "Partial Content",
-    MULTI_STATUS: "Multi-Status",
-
-    # 300
-    MULTIPLE_CHOICE: "Multiple Choices",
-    MOVED_PERMANENTLY: "Moved Permanently",
-    FOUND: "Found",
-    SEE_OTHER: "See Other",
-    NOT_MODIFIED: "Not Modified",
-    USE_PROXY: "Use Proxy",
-    # 306 not defined??
-    TEMPORARY_REDIRECT: "Temporary Redirect",
-
-    # 400
-    BAD_REQUEST: "Bad Request",
-    UNAUTHORIZED: "Unauthorized",
-    PAYMENT_REQUIRED: "Payment Required",
-    FORBIDDEN: "Forbidden",
-    NOT_FOUND: "Not Found",
-    NOT_ALLOWED: "Method Not Allowed",
-    NOT_ACCEPTABLE: "Not Acceptable",
-    PROXY_AUTH_REQUIRED: "Proxy Authentication Required",
-    REQUEST_TIMEOUT: "Request Time-out",
-    CONFLICT: "Conflict",
-    GONE: "Gone",
-    LENGTH_REQUIRED: "Length Required",
-    PRECONDITION_FAILED: "Precondition Failed",
-    REQUEST_ENTITY_TOO_LARGE: "Request Entity Too Large",
-    REQUEST_URI_TOO_LONG: "Request-URI Too Long",
-    UNSUPPORTED_MEDIA_TYPE: "Unsupported Media Type",
-    REQUESTED_RANGE_NOT_SATISFIABLE: "Requested Range not satisfiable",
-    EXPECTATION_FAILED: "Expectation Failed",
-
-    # 500
-    INTERNAL_SERVER_ERROR: "Internal Server Error",
-    NOT_IMPLEMENTED: "Not Implemented",
-    BAD_GATEWAY: "Bad Gateway",
-    SERVICE_UNAVAILABLE: "Service Unavailable",
-    GATEWAY_TIMEOUT: "Gateway Time-out",
-    HTTP_VERSION_NOT_SUPPORTED: "HTTP Version not supported",
-    INSUFFICIENT_STORAGE_SPACE: "Insufficient Storage Space",
-    NOT_EXTENDED: "Not Extended"
-}
diff --git a/libpathod/rparse.py b/libpathod/rparse.py
index 470845200..92d0a54b8 100644
--- a/libpathod/rparse.py
+++ b/libpathod/rparse.py
@@ -1,6 +1,6 @@
 import operator, string, random, mmap, os, time
 import contrib.pyparsing as pp
-import http
+from netlib import http_status
 
 TESTING = False
 
@@ -315,7 +315,7 @@ class Code:
     def __init__(self, code, msg=None):
         self.code, self.msg = code, msg
         if msg is None:
-            self.msg = ValueLiteral(http.RESPONSES.get(self.code, "Unknown code"))
+            self.msg = ValueLiteral(http_status.RESPONSES.get(self.code, "Unknown code"))
 
     def mod_response(self, settings, r):
         r.code = self.code
@@ -342,7 +342,7 @@ class Response:
     )
     version = "HTTP/1.1"
     code = 200
-    msg = LiteralGenerator(http.RESPONSES[code])
+    msg = LiteralGenerator(http_status.RESPONSES[code])
     body = LiteralGenerator("")
     def __init__(self):
         self.headers = []
@@ -481,7 +481,7 @@ class InternalResponse(Response):
     def __init__(self, code, body):
         Response.__init__(self)
         self.code = code
-        self.msg = LiteralGenerator(http.RESPONSES.get(code, "Unknown error"))
+        self.msg = LiteralGenerator(http_status.RESPONSES.get(code, "Unknown error"))
         self.body = LiteralGenerator(body)
         self.headers = [
             (