Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into python3
[wrw.git]
/
wrw
/
resp.py
diff --git
a/wrw/resp.py
b/wrw/resp.py
index
159126a
..
69635f8
100644
(file)
--- a/
wrw/resp.py
+++ b/
wrw/resp.py
@@
-1,5
+1,5
@@
-import dispatch, proto, env
-from sp import xhtml
+
from .
import dispatch, proto, env
+from
.
sp import xhtml
h = xhtml.cons()
__all__ = ["skeleton", "skelfor", "setskel", "usererror"]
h = xhtml.cons()
__all__ = ["skeleton", "skelfor", "setskel", "usererror"]
@@
-28,7
+28,7
@@
def setskel(req, skel):
class usererror(dispatch.restart):
def __init__(self, message, *detail):
class usererror(dispatch.restart):
def __init__(self, message, *detail):
- super(
usererror, self
).__init__()
+ super().__init__()
self.message = message
self.detail = detail
self.message = message
self.detail = detail
@@
-36,9
+36,9
@@
class usererror(dispatch.restart):
return skelfor(req).error(req, self.message, *self.detail)
class message(dispatch.restart):
return skelfor(req).error(req, self.message, *self.detail)
class message(dispatch.restart):
- def __init__(self, m
sg
, *detail):
- super(
message, self
).__init__()
- self.message = m
sg
+ def __init__(self, m
essage
, *detail):
+ super().__init__()
+ self.message = m
essage
self.detail = detail
def handle(self, req):
self.detail = detail
def handle(self, req):
@@
-50,20
+50,20
@@
class httperror(usererror):
message = proto.statusinfo[status][0]
if detail is None:
detail = (proto.statusinfo[status][1],)
message = proto.statusinfo[status][0]
if detail is None:
detail = (proto.statusinfo[status][1],)
- super(
httperror, self
).__init__(message, *detail)
+ super().__init__(message, *detail)
self.status = status
def handle(self, req):
req.status(self.status, self.message)
self.status = status
def handle(self, req):
req.status(self.status, self.message)
- return super(
httperror, self
).handle(req)
+ return super().handle(req)
class notfound(httperror):
def __init__(self):
class notfound(httperror):
def __init__(self):
- return super(
notfound, self
).__init__(404)
+ return super().__init__(404)
class redirect(dispatch.restart):
def __init__(self, url, status = 303):
class redirect(dispatch.restart):
def __init__(self, url, status = 303):
- super(
redirect, self
).__init__()
+ super().__init__()
self.url = url
self.status = status
self.url = url
self.status = status