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
/
req.py
diff --git
a/wrw/req.py
b/wrw/req.py
index
41fd330
..
016d2d8
100644
(file)
--- a/
wrw/req.py
+++ b/
wrw/req.py
@@
-19,7
+19,7
@@
class headdict(object):
del self.dict[key.lower()]
def __iter__(self):
del self.dict[key.lower()]
def __iter__(self):
- return iter((list[0] for list in self.dict.
iter
values()))
+ return iter((list[0] for list in self.dict.values()))
def get(self, key, default=""):
if key.lower() in self.dict:
def get(self, key, default=""):
if key.lower() in self.dict:
@@
-67,29
+67,29
@@
class limitreader(object):
ra = min(ra, size)
while len(self.buf) < ra:
ret = self.bk.read(ra - len(self.buf))
ra = min(ra, size)
while len(self.buf) < ra:
ret = self.bk.read(ra - len(self.buf))
- if ret == "":
+ if ret ==
b
"":
raise IOError("Unexpected EOF")
self.buf.extend(ret)
self.rb += len(ret)
raise IOError("Unexpected EOF")
self.buf.extend(ret)
self.rb += len(ret)
- ret =
str
(self.buf[:ra])
+ ret =
bytes
(self.buf[:ra])
self.buf = self.buf[ra:]
return ret
def readline(self, size=-1):
off = 0
while True:
self.buf = self.buf[ra:]
return ret
def readline(self, size=-1):
off = 0
while True:
- p = self.buf.find('\n', off)
+ p = self.buf.find(
b
'\n', off)
if p >= 0:
if p >= 0:
- ret =
str
(self.buf[:p + 1])
+ ret =
bytes
(self.buf[:p + 1])
self.buf = self.buf[p + 1:]
return ret
off = len(self.buf)
if size >= 0 and len(self.buf) >= size:
self.buf = self.buf[p + 1:]
return ret
off = len(self.buf)
if size >= 0 and len(self.buf) >= size:
- ret =
str
(self.buf[:size])
+ ret =
bytes
(self.buf[:size])
self.buf = self.buf[size:]
return ret
if self.rb == self.limit:
self.buf = self.buf[size:]
return ret
if self.rb == self.limit:
- ret =
str
(self.buf)
+ ret =
bytes
(self.buf)
self.buf = bytearray()
return ret
ra = self.limit - self.rb
self.buf = bytearray()
return ret
ra = self.limit - self.rb
@@
-97,7
+97,7
@@
class limitreader(object):
ra = min(ra, size)
ra = min(ra, 1024)
ret = self.bk.read(ra)
ra = min(ra, size)
ra = min(ra, 1024)
ret = self.bk.read(ra)
- if ret == "":
+ if ret ==
b
"":
raise IOError("Unpexpected EOF")
self.buf.extend(ret)
self.rb += len(ret)
raise IOError("Unpexpected EOF")
self.buf.extend(ret)
self.rb += len(ret)
@@
-109,9
+109,9
@@
class limitreader(object):
class lineiter(object):
def __iter__(self):
return self
class lineiter(object):
def __iter__(self):
return self
- def
next
(self):
+ def
__next__
(self):
ret = rd.readline()
ret = rd.readline()
- if ret == "":
+ if ret ==
b
"":
raise StopIteration()
return ret
return lineiter()
raise StopIteration()
return ret
return lineiter()
@@
-148,7
+148,7
@@
class origrequest(request):
self.input = limitreader(env["wsgi.input"], int(clen))
else:
# XXX: What to do?
self.input = limitreader(env["wsgi.input"], int(clen))
else:
# XXX: What to do?
- self.input = io.BytesIO("")
+ self.input = io.BytesIO(
b
"")
else:
# Assume input is chunked and read until ordinary EOF.
self.input = env["wsgi.input"]
else:
# Assume input is chunked and read until ordinary EOF.
self.input = env["wsgi.input"]