From 10c1dbe01e6e961e62bd26a614b5353975caaf74 Mon Sep 17 00:00:00 2001
From: rallytime <nicole@saltstack.com>
Date: Mon, 30 Mar 2015 14:21:17 -0600
Subject: [PATCH] Fix remaining pylint errors for cassandra_cql.py

---
 salt/modules/cassandra_cql.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/salt/modules/cassandra_cql.py b/salt/modules/cassandra_cql.py
index 48222a346b..0aa144b782 100644
--- a/salt/modules/cassandra_cql.py
+++ b/salt/modules/cassandra_cql.py
@@ -48,11 +48,13 @@ __virtualname__ = 'cassandra_cql'
 
 HAS_DRIVER = False
 try:
-    from .cassandra.cluster import Cluster
-    from .cassandra.cluster import NoHostAvailable
-    from .cassandra.connection import ConnectionException, ConnectionShutdown
-    from .cassandra.auth import PlainTextAuthProvider
-    from .cassandra.query import dict_factory
+    # pylint: disable=import-error,no-name-in-module
+    from cassandra.cluster import Cluster
+    from cassandra.cluster import NoHostAvailable
+    from cassandra.connection import ConnectionException, ConnectionShutdown
+    from cassandra.auth import PlainTextAuthProvider
+    from cassandra.query import dict_factory
+    # pylint: enable=import-error,no-name-in-module
     HAS_DRIVER = True
 except ImportError:
     pass
@@ -454,7 +456,7 @@ def create_keyspace(keyspace, replication_strategy='SimpleStrategy', replication
                 try:
                     replication_datacenter_map = json.loads(replication_datacenters)
                     replication_map.update(**replication_datacenter_map)
-                except BaseException:
+                except BaseException:  # pylint: disable=W0703
                     log.error("Could not load json replication_datacenters.")
                     return False
             else: