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 jython
[wrw.git]
/
wrw
/
req.py
diff --git
a/wrw/req.py
b/wrw/req.py
index
5fbc2fe
..
fbe732b
100644
(file)
--- a/
wrw/req.py
+++ b/
wrw/req.py
@@
-1,4
+1,4
@@
-import
io
+import
StringIO
__all__ = ["request"]
__all__ = ["request"]
@@
-56,7
+56,7
@@
class limitreader(object):
self.bk = back
self.limit = limit
self.rb = 0
self.bk = back
self.limit = limit
self.rb = 0
- self.buf =
bytearray()
+ self.buf =
""
def close(self):
pass
def close(self):
pass
@@
-69,9
+69,9
@@
class limitreader(object):
ret = self.bk.read(ra - len(self.buf))
if ret == "":
raise IOError("Unexpected EOF")
ret = self.bk.read(ra - len(self.buf))
if ret == "":
raise IOError("Unexpected EOF")
- self.buf
.extend(ret)
+ self.buf
+= ret
self.rb += len(ret)
self.rb += len(ret)
- ret = s
tr(self.buf[:ra])
+ ret = s
elf.buf[:ra]
self.buf = self.buf[ra:]
return ret
self.buf = self.buf[ra:]
return ret
@@
-80,17
+80,17
@@
class limitreader(object):
while True:
p = self.buf.find('\n', off)
if p >= 0:
while True:
p = self.buf.find('\n', off)
if p >= 0:
- ret = s
tr(self.buf[:p + 1])
+ ret = s
elf.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 = s
tr(self.buf[:size])
+ ret = s
elf.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 = s
tr(self.buf)
- self.buf =
bytearray()
+ ret = s
elf.buf
+ self.buf =
""
return ret
ra = self.limit - self.rb
if size >= 0:
return ret
ra = self.limit - self.rb
if size >= 0:
@@
-99,7
+99,7
@@
class limitreader(object):
ret = self.bk.read(ra)
if ret == "":
raise IOError("Unpexpected EOF")
ret = self.bk.read(ra)
if ret == "":
raise IOError("Unpexpected EOF")
- self.buf
.extend(ret)
+ self.buf
+= ret
self.rb += len(ret)
def readlines(self, hint=None):
self.rb += len(ret)
def readlines(self, hint=None):
@@
-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.Bytes
IO("")
+ self.input =
StringIO.String
IO("")
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"]