From 6abccbc0cfe66267fa5660eda9b14bd39d6c513c Mon Sep 17 00:00:00 2001
From: Thomas S Hatch <thatch45@gmail.com>
Date: Tue, 15 Jul 2014 15:06:15 -0600
Subject: [PATCH] fix this better, don't use clean_proc from master.py.

---
 salt/master.py                 | 8 ++------
 tests/unit/utils/event_test.py | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/salt/master.py b/salt/master.py
index 7bac9a0329..31b4edd437 100644
--- a/salt/master.py
+++ b/salt/master.py
@@ -18,12 +18,8 @@ import multiprocessing
 import sys
 
 # Import third party libs
-try:
-    import zmq
-    from M2Crypto import RSA
-except ImportError:
-    # Don't fail on RAET when utils may import
-    pass
+import zmq
+from M2Crypto import RSA
 
 # Import salt libs
 import salt.crypt
diff --git a/tests/unit/utils/event_test.py b/tests/unit/utils/event_test.py
index 1117f3253d..2b533ea391 100644
--- a/tests/unit/utils/event_test.py
+++ b/tests/unit/utils/event_test.py
@@ -23,7 +23,7 @@ ensure_in_syspath('../../')
 
 # Import salt libs
 import integration
-from salt.master import clean_proc
+from salt.utils.process import clean_proc
 from salt.utils import event
 
 SOCK_DIR = os.path.join(integration.TMP, 'test-socks')