From 439d9a294c7df4d45b133e42edb3521901628daa Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Tue, 30 Jul 2013 09:42:29 +1200
Subject: Make use of a change to netlib.tcp that clarifies error conditions
 for flush and close.

Should fix #144.
---
 libmproxy/proxy.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'libmproxy/proxy.py')

diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index ae5cd7d3..b1a5f084 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -85,12 +85,9 @@ class ServerConnection(tcp.TCPClient):
         if self.connection:
             try:
                 self.wfile.flush()
-            except IOError, tcp.NetLibDisconnect: # pragma: no cover
-                pass
-            try:
-                self.connection.close()
-            except IOError:
+            except tcp.NetLibDisconnect: # pragma: no cover
                 pass
+            self.connection.close()
 
 
 
-- 
cgit v1.2.3