Merge pull request #64 from cvubrugier/pylint-fixes

Pylint fixes

3 files changed, 5 insertions, 8 deletions

diff --git a/rtslib/fabric.py b/rtslib/fabric.py
index b2100da..eae6325 100644
--- a/rtslib/fabric.py
+++ b/rtslib/fabric.py
@@ -113,7 +113,7 @@ import os
 import six
 
 from .node import CFSNode
-from .utils import fread, fwrite, generate_wwn, normalize_wwn, colonize
+from .utils import fread, fwrite, normalize_wwn, colonize
 from .utils import RTSLibError, modprobe, ignored
 from .target import Target
 from .utils import _get_auth_attr, _set_auth_attr
diff --git a/rtslib/root.py b/rtslib/root.py
index 2c720bb..a4fbb2e 100644
--- a/rtslib/root.py
+++ b/rtslib/root.py
@@ -18,7 +18,6 @@ License for the specific language governing permissions and limitations
 under the License.
 '''
 
-import re
 import os
 import stat
 import json
@@ -27,7 +26,7 @@ from .node import CFSNode
 from .target import Target
 from .fabric import FabricModule
 from .tcm import so_mapping, StorageObject
-from .utils import RTSLibError, RTSLibBrokenLink, modprobe, mount_configfs
+from .utils import RTSLibError, modprobe, mount_configfs
 from .utils import dict_remove, set_attributes
 
 default_save_file = "/etc/target/saveconfig.json"
@@ -106,7 +105,7 @@ class RTSRoot(CFSNode):
     def _list_mapped_lun_groups(self):
         self._check_self()
         for nag in self.node_acl_groups:
-            for mlg in na.mapped_lun_groups:
+            for mlg in nag.mapped_lun_groups:
                 yield mlg
 
     def _list_network_portals(self):
diff --git a/rtslib/target.py b/rtslib/target.py
index dfe5d7b..7764c39 100644
--- a/rtslib/target.py
+++ b/rtslib/target.py
@@ -18,16 +18,14 @@ License for the specific language governing permissions and limitations
 under the License.
 '''
 
-import re
 import os
 from glob import iglob as glob
 from functools import partial
-from os.path import isdir
 from six.moves import range
 import uuid
 
 from .node import CFSNode
-from .utils import RTSLibError, RTSLibBrokenLink
+from .utils import RTSLibError
 from .utils import fread, fwrite, normalize_wwn, generate_wwn
 from .utils import dict_remove, set_attributes, set_parameters, ignored
 from .utils import _get_auth_attr, _set_auth_attr
@@ -1260,7 +1258,7 @@ class Group(object):
 def _check_group_name(name):
     # Since all WWNs have a '.' in them, let's avoid confusion.
     if '.' in name:
-        raise ExecutionError("'.' not permitted in group names.")
+        raise RTSLibError("'.' not permitted in group names.")
 
 
 class NodeACLGroup(Group):