Permalink
Browse files

pylint -E fixes

Change-Id: I6caf46c8ce45308ac41b27d0831b625bf456c71a
Reviewed-on: http://review.membase.org/5067
Reviewed-by: Sean Lynch <seanlynch5@gmail.com>
Tested-by: Sean Lynch <seanlynch5@gmail.com>
  • Loading branch information...
1 parent b9c8a7d commit 91817c5c0011843fbf32069ee86d577ee3cfb5bf @steveyen steveyen committed with Sean Lynch Mar 23, 2011
Showing with 4 additions and 4 deletions.
  1. +4 −4 restclient.py
View
@@ -32,10 +32,10 @@ def clientConnect(self, server, port):
error_connect = "Unable to connect to %s" % self.server
try:
self.conn = httplib.HTTPConnection(server, port)
- except httplib.HTTPException:
+ except httplib.NotConnected:
print error_connect
sys.exit(2)
- except httplib.NotConnected:
+ except httplib.HTTPException:
print error_connect
sys.exit(2)
except socket.error:
@@ -134,10 +134,10 @@ def makeRequest(self, method, uri, encoded_params, headers):
error_connect = "ERROR: unable to connect to %s:%d" % (self.server, self.port)
try:
self.conn.request(method, uri, encoded_params, headers)
- except httplib.HTTPException:
+ except httplib.NotConnected:
print error_connect
sys.exit(2)
- except httplib.NotConnected:
+ except httplib.HTTPException:
print error_connect
sys.exit(2)
except socket.error:

0 comments on commit 91817c5

Please sign in to comment.