python/httpie-cli
1
0
Fork 0
mirror of https://github.com/httpie/cli.git synced 2025-05-13 22:06:33 +02:00
Code

Output stream refactoring.

Browse Source
This commit is contained in:
Jakub Roztocil 2012-11-09 15:49:23 +01:00
parent 466e1dbedf
commit 1c5fb89001
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
httpie/output.py
View File

@ -160,23 +160,23 @@ class BaseStream(object):
self.with_headers = with_headers self.with_headers = with_headers
self.with_body = with_body self.with_body = with_body
def _headers(self): def _get_headers(self):
"""Return the headers' bytes.""" """Return the headers' bytes."""
return self.msg.headers.encode('ascii') return self.msg.headers.encode('ascii')
def _body(self): def _iter_body(self):
"""Return an iterator over the message body.""" """Return an iterator over the message body."""
raise NotImplementedError() raise NotImplementedError()
def __iter__(self): def __iter__(self):
"""Return an iterator over `self.msg`.""" """Return an iterator over `self.msg`."""
if self.with_headers: if self.with_headers:
yield self._headers() yield self._get_headers()
yield b'\r\n\r\n' yield b'\r\n\r\n'
if self.with_body: if self.with_body:
try: try:
for chunk in self._body(): for chunk in self._iter_body():
yield chunk yield chunk
except BinarySuppressedError as e: except BinarySuppressedError as e:
if self.with_headers: if self.with_headers:
@ -194,7 +194,7 @@ class RawStream(BaseStream):
super(RawStream, self).__init__(**kwargs) super(RawStream, self).__init__(**kwargs)
self.chunk_size = chunk_size self.chunk_size = chunk_size
def _body(self): def _iter_body(self):
return self.msg.iter_body(self.chunk_size) return self.msg.iter_body(self.chunk_size)
@ -222,7 +222,7 @@ class EncodedStream(BaseStream):
# Default to utf8 when unsure. # Default to utf8 when unsure.
self.output_encoding = output_encoding or 'utf8' self.output_encoding = output_encoding or 'utf8'
def _body(self): def _iter_body(self):
for line, lf in self.msg.iter_lines(self.CHUNK_SIZE): for line, lf in self.msg.iter_lines(self.CHUNK_SIZE):
@ -248,11 +248,11 @@ class PrettyStream(EncodedStream):
super(PrettyStream, self).__init__(**kwargs) super(PrettyStream, self).__init__(**kwargs)
self.processor = processor self.processor = processor
def _headers(self): def _get_headers(self):
return self.processor.process_headers( return self.processor.process_headers(
self.msg.headers).encode(self.output_encoding) self.msg.headers).encode(self.output_encoding)
def _body(self): def _iter_body(self):
for line, lf in self.msg.iter_lines(self.CHUNK_SIZE): for line, lf in self.msg.iter_lines(self.CHUNK_SIZE):
if b'\0' in line: if b'\0' in line:
raise BinarySuppressedError() raise BinarySuppressedError()
@ -276,7 +276,7 @@ class BufferedPrettyStream(PrettyStream):
CHUNK_SIZE = 1024 * 10 CHUNK_SIZE = 1024 * 10
def _body(self): def _iter_body(self):
#noinspection PyArgumentList #noinspection PyArgumentList
# Read the whole body before prettifying it, # Read the whole body before prettifying it,