Merge pull request #1718 from jsiirola/import-updates

Import updates

Author: michaelbynum

pyomo/neos/kestrel.py

@@ -26,8 +26,6 @@
 import tempfile
 import logging
 
-from six.moves.http_client import BadStatusLine
-
 from pyomo.common.dependencies import attempt_import
 
 def _xmlrpclib_importer():
@@ -150,7 +148,8 @@ def setup_connection(self):
         try:
             result = self.neos.ping()
             logger.info("OK.")
-        except (socket.error, xmlrpclib.ProtocolError, BadStatusLine):
+        except (socket.error, xmlrpclib.ProtocolError,
+                six.moves.http_client.BadStatusLine):
             e = sys.exc_info()[1]
             self.neos = None
             logger.info("Fail.")