From 7b71d7eef57d22bef8a3bdc7f304ef87e43c65ad Mon Sep 17 00:00:00 2001
From: Avi Marcus <avi@bestfone.com>
Date: Thu, 5 Jul 2012 02:41:42 +0300
Subject: [PATCH] remove try for time, it's a normal import anyway

---
 salt/modules/mysql.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/salt/modules/mysql.py b/salt/modules/mysql.py
index 5b8d547280..75c5f0bb07 100644
--- a/salt/modules/mysql.py
+++ b/salt/modules/mysql.py
@@ -128,10 +128,8 @@ def query(database, query):
         returns: [{'query time': {'h': '39.0ms', 'raw': '0.03899'}},
             {'rows affected': 1L}
     '''
-    #try:
+
     import time
-    #except ImportError:
-    #    timer = False
 
     #Doesn't do anything about sql warnings, e.g. empty values on an insert.
     #I don't think it handles multiple queries at once, so adding "commit" might not work.