"""
import os, socket
-from . import htlib
+import htlib
__all__ = ["req", "recvreq", "sendreq"]
self.ver = ver
self.rest = rest
self.headers = headers
- self.bsk = socket.fromfd(fd, socket.AF_UNIX, socket.SOCK_STREAM)
- self.sk = self.bsk.makefile('rwb')
+ self.sk = socket.fromfd(fd, socket.AF_UNIX, socket.SOCK_STREAM).makefile('r+')
os.close(fd)
def close(self):
"Close this request's response socket."
self.sk.close()
- self.bsk.close()
def __getitem__(self, header):
"""Find a HTTP header case-insensitively. For example,
header regardlessly of whether the client specified it as
"Content-Type", "content-type" or "Content-type".
"""
- if isinstance(header, str):
- header = header.encode("ascii")
header = header.lower()
for key, val in self.headers:
if key.lower() == header:
"""Works analogously to the __getitem__ method for checking
header presence case-insensitively.
"""
- if isinstance(header, str):
- header = header.encode("ascii")
header = header.lower()
for key, val in self.headers:
if key.lower() == header:
"""Creates a duplicate of this request, referring to a
duplicate of the response socket.
"""
- return req(self.method, self.url, self.ver, self.rest, self.headers, os.dup(self.bsk.fileno()))
+ return req(self.method, self.url, self.ver, self.rest, self.headers, os.dup(self.sk.fileno()))
def match(self, match):
"""If the `match' argument matches exactly the leading part of
else:
util.respond(req, "Not found", status = "404 Not Found", ctype = "text/plain")
"""
- if isinstance(match, str):
- match = match.encode("utf-8")
if self.rest[:len(match)] == match:
self.rest = self.rest[len(match):]
return True
return False
def __str__(self):
- def dec(b):
- return b.decode("ascii", errors="replace")
- return "\"%s %s %s\"" % (dec(self.method), dec(self.url), dec(self.ver))
+ return "\"%s %s %s\"" % (self.method, self.url, self.ver)
def __enter__(self):
return self
if fd is None:
return None
try:
- parts = data.split(b'\0')[:-1]
+ parts = data.split('\0')[:-1]
if len(parts) < 5:
raise protoerr("Truncated request")
method, url, ver, rest = parts[:4]
headers = []
i = 4
while True:
- if parts[i] == b"": break
+ if parts[i] == "": break
if len(parts) - i < 3:
raise protoerr("Truncated request")
headers.append((parts[i], parts[i + 1]))
This function may raise an OSError if an error occurs on the
socket.
"""
- data = b""
- data += req.method + b'\0'
- data += req.url + b'\0'
- data += req.ver + b'\0'
- data += req.rest + b'\0'
+ data = ""
+ data += req.method + '\0'
+ data += req.url + '\0'
+ data += req.ver + '\0'
+ data += req.rest + '\0'
for key, val in req.headers:
- data += key + b'\0'
- data += val + b'\0'
- data += b'\0'
+ data += key + '\0'
+ data += val + '\0'
+ data += '\0'
htlib.sendfd(sock, req.sk.fileno(), data)