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
/
dispatch.py
diff --git
a/wrw/dispatch.py
b/wrw/dispatch.py
index
15ea99e
..
e51559e
100644
(file)
--- a/
wrw/dispatch.py
+++ b/
wrw/dispatch.py
@@
-1,5
+1,5
@@
import sys, traceback
import sys, traceback
-import env
+
from .
import env
__all__ = ["restart"]
__all__ = ["restart"]
@@
-23,17
+23,17
@@
class iterproxy(object):
self.bk = real
self.bki = iter(real)
self._next = [None]
self.bk = real
self.bki = iter(real)
self._next = [None]
- self.
next
()
+ self.
__next__
()
def __iter__(self):
return self
def __iter__(self):
return self
- def
next
(self):
+ def
__next__
(self):
if self._next is None:
raise StopIteration()
ret = self._next[0]
try:
if self._next is None:
raise StopIteration()
ret = self._next[0]
try:
- self._next[:] = [self.bki.
next
()]
+ self._next[:] = [self.bki.
__next__
()]
except StopIteration:
self._next = None
return ret
except StopIteration:
self._next = None
return ret
@@
-43,7
+43,7
@@
class iterproxy(object):
self.bk.close()
def defaulterror(req, excinfo):
self.bk.close()
def defaulterror(req, excinfo):
- import resp
+
from .
import resp
traceback.print_exception(*excinfo)
raise resp.httperror(500)
traceback.print_exception(*excinfo)
raise resp.httperror(500)
@@
-62,9
+62,9
@@
def handle(req, startreq, handler):
try:
resp = iterproxy(handler(req))
break
try:
resp = iterproxy(handler(req))
break
- except restart
,
i:
+ except restart
as
i:
handler = i.handle
handler = i.handle
- except Exception
,
i:
+ except Exception
as
i:
if eh is None:
raise
handler = wraphandler(eh, sys.exc_info())
if eh is None:
raise
handler = wraphandler(eh, sys.exc_info())