Commit aed40b50 authored by Denis Bilenko's avatar Denis Bilenko

cut repetition in str and repr formatting

parent ec035ed2
...@@ -141,16 +141,22 @@ cdef class http_request: ...@@ -141,16 +141,22 @@ cdef class http_request:
return res return res
def __str__(self): def __str__(self):
if self.__obj: try:
return '<%s %s>' % (self.__class__.__name__, self._format()) info = self._format()
else: except HttpRequestDeleted:
return '<%s deleted>' % self.__class__.__name__ info = 'deleted'
except Exception, ex:
info = str(ex) or repr(ex) or '<Error>'
return '<%s %s>' % (self.__class__.__name__, info)
def __repr__(self): def __repr__(self):
if self.__obj: try:
return '<%s _obj=0x%x %s>' % (self.__class__.__name__, self._obj, self._format()) info = ' ' + self._format()
else: except HttpRequestDeleted:
return '<%s _obj=0x%x>' % (self.__class__.__name__, self._obj) info = ''
except Exception, ex:
info = ' ' + (str(ex) or repr(ex) or '<Error>')
return '<%s _obj=0x%x %s>' % (self.__class__.__name__, self._obj, info)
def get_input_headers(self): def get_input_headers(self):
if not self.__obj: if not self.__obj:
...@@ -408,16 +414,18 @@ cdef class http_connection: ...@@ -408,16 +414,18 @@ cdef class http_connection:
return False return False
def __str__(self): def __str__(self):
if self.__obj: try:
return '<%s %s>' % (self.__class__.__name__, self.peer) peer = self.peer
else: except HttpConnectionDeleted:
return '<%s deleted>' % (self.__class__.__name__) peer = 'deleted'
return '<%s %s>' % (self.__class__.__name__, peer)
def __repr__(self): def __repr__(self):
if self.__obj: try:
return '<%s _obj=0x%x %s>' % (self.__class__.__name__, self._obj, self.peer) peer = ' %s' % (self.peer, )
else: except HttpConnectionDeleted:
return '<%s _obj=0x%x>' % (self.__class__.__name__, self._obj) peer = ''
return '<%s _obj=0x%x%s>' % (self.__class__.__name__, self._obj, peer)
property peer: property peer:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment