Use subprocess32 to match libcalico

projectcalico · Dec 9, 2015 · 3b190ea · 3b190ea
1 parent 1b23ff3
commit 3b190ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/calico_kubernetes/calico_kubernetes.py b/calico_kubernetes/calico_kubernetes.py
@@ -30,7 +30,7 @@
 
 from netaddr import IPAddress, IPNetwork, AddrFormatError
 from policy import PolicyParser
-from subprocess import check_output, CalledProcessError, check_call
+from subprocess32 import check_output, CalledProcessError, check_call
 
 import pycalico
 from pycalico import netns
@@ -503,7 +503,7 @@ def _remove_endpoint(self, endpoint):
             self._datastore_client.remove_workload(
                 HOSTNAME, ORCHESTRATOR_ID, self.docker_id)
         except KeyError:
-            logger.exception("Failed to remove workload.")
+            logger.exception("Error removing workload.")
         logger.info("Removed Calico endpoint %s", endpoint.endpoint_id)
 
     def _validate_container_state(self, container_name):

diff --git a/calico_kubernetes/tests/kube_plugin_test.py b/calico_kubernetes/tests/kube_plugin_test.py
@@ -25,7 +25,7 @@
 from netaddr import IPAddress, IPNetwork
 from nose.tools import assert_equal, assert_true, assert_false, assert_raises
 from nose_parameterized import parameterized
-from subprocess import CalledProcessError
+from subprocess32 import CalledProcessError
 
 from calico_kubernetes import calico_kubernetes, logutils, policy
 from pycalico.block import AlreadyAssignedError