diff options
| author | Robert Brewer <fumanchu@aminus.org> | 2011-10-15 11:43:39 -0700 |
|---|---|---|
| committer | Robert Brewer <fumanchu@aminus.org> | 2011-10-15 11:43:39 -0700 |
| commit | 1e29a0a37f8d53131ffc138fb986b54fc09368b8 (patch) | |
| tree | 48c2a9e91bdb1fdc470a30f5a5a58106f828e986 | |
| parent | 6937478705777ed4580c7562c61b6231d73be5f3 (diff) | |
| download | cherrypy-git-cherrypy-3.2.2rc1.tar.gz | |
Fixed #1057 (KnownLengthRFile returns wrong type when data exhausted)cherrypy-3.2.2rc1
| -rw-r--r-- | cherrypy/wsgiserver/wsgiserver3.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/cherrypy/wsgiserver/wsgiserver3.py index 90c9d257..1a56129d 100644 --- a/cherrypy/wsgiserver/wsgiserver3.py +++ b/cherrypy/wsgiserver/wsgiserver3.py @@ -310,7 +310,7 @@ class KnownLengthRFile(object): def read(self, size=None): if self.remaining == 0: - return '' + return b'' if size is None: size = self.remaining else: @@ -322,7 +322,7 @@ class KnownLengthRFile(object): def readline(self, size=None): if self.remaining == 0: - return '' + return b'' if size is None: size = self.remaining else: |