# HG changeset patch
# User Andrey Skvortsov <andrej.skvortzov@gmail.com>
# Date 1538227781 -10800
# Node ID aad985da14f7b22e72bbf49393486673dfda870a
# Parent  3315e621d7fb625b33539e662e34f8af4201418c
clean etherlab: pylint, C0412          # (ungrouped-imports) Imports from package X are not grouped

diff -r 3315e621d7fb -r aad985da14f7 etherlab/ConfigEditor.py
--- a/etherlab/ConfigEditor.py	Sat Sep 29 16:23:20 2018 +0300
+++ b/etherlab/ConfigEditor.py	Sat Sep 29 16:29:41 2018 +0300
@@ -20,13 +20,13 @@
 
 from plcopen.structures import IEC_KEYWORDS, TestIdentifier
 from controls import CustomGrid, CustomTable, FolderTree
+from controls.CustomStyledTextCtrl import NAVIGATION_KEYS
 from editors.ConfTreeNodeEditor import ConfTreeNodeEditor, SCROLLBAR_UNIT
 from util.BitmapLibrary import GetBitmap
-from controls.CustomStyledTextCtrl import NAVIGATION_KEYS
+from util.TranslationCatalogs import NoTranslate
 
 # -----------------------------------------------------------------------
 from EtherCATManagementEditor import EtherCATManagementTreebook, MasterStatePanelClass
-from util.TranslationCatalogs import NoTranslate
 # -----------------------------------------------------------------------
 
 [ETHERCAT_VENDOR, ETHERCAT_GROUP, ETHERCAT_DEVICE] = range(3)
@@ -240,7 +240,7 @@
                     else:
                         dir = "%Q"
                     location = "%s%s" % (dir, data_size) + \
-                               ".".join(map(lambda x: str(x), location + (entry_index, entry_subindex)))
+                               ".".join(map(str, location + (entry_index, entry_subindex)))
 
                     data = wx.TextDataObject(str((location, "location", data_type, var_name, "", access)))
                     dragSource = wx.DropSource(self.VariablesGrid)
@@ -1005,7 +1005,7 @@
             data_size = self.Controler.GetSizeOfType(var_type)
             number = self.ProcessVariablesTable.GetValueByName(row, "Number")
             location = "%%M%s" % data_size + \
-                       ".".join(map(lambda x: str(x), self.Controler.GetCurrentLocation() + (number,)))
+                       ".".join(map(str, self.Controler.GetCurrentLocation() + (number,)))
 
             data = wx.TextDataObject(str((location, "location", var_type, var_name, "")))
             dragSource = wx.DropSource(self.ProcessVariablesGrid)
diff -r 3315e621d7fb -r aad985da14f7 etherlab/EthercatMaster.py
--- a/etherlab/EthercatMaster.py	Sat Sep 29 16:23:20 2018 +0300
+++ b/etherlab/EthercatMaster.py	Sat Sep 29 16:29:41 2018 +0300
@@ -22,11 +22,11 @@
 from ConfigTreeNode import ConfigTreeNode
 from dialogs import BrowseValuesLibraryDialog
 from IDEFrame import TITLE, FILEMENU, PROJECTTREE
-
+from POULibrary import POULibrary
+
+from ConfigEditor import MasterEditor
+from EthercatCFileGenerator import _EthercatCFileGenerator
 from EthercatSlave import _EthercatSlaveCTN, ExtractHexDecValue, GenerateHexDecValue, TYPECONVERSION, VARCLASSCONVERSION, _CommonSlave
-from EthercatCFileGenerator import _EthercatCFileGenerator
-from ConfigEditor import MasterEditor
-from POULibrary import POULibrary
 
 try:
     from EthercatCIA402Slave import _EthercatCIA402SlaveCTN