clean-up: fix PEP8 E401 multiple imports on one line
--- a/Beremiz.py Mon Aug 14 21:09:48 2017 +0300
+++ b/Beremiz.py Mon Aug 14 21:20:32 2017 +0300
@@ -24,7 +24,9 @@
import util.paths as paths
--- a/BeremizIDE.py Mon Aug 14 21:09:48 2017 +0300
+++ b/BeremizIDE.py Mon Aug 14 21:20:32 2017 +0300
@@ -24,12 +24,14 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import util.paths as paths
from types import ListType
@@ -40,9 +42,17 @@
-import wx.lib.buttons, wx.lib.statbmp, wx.stc
-import types, time, re, platform, time, traceback, commands
from docutil import OpenHtmlFrame
from editors.EditorPanel import EditorPanel
@@ -1071,7 +1081,8 @@
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
-import threading, traceback
Max_Traceback_List_Size = 20
--- a/Beremiz_service.py Mon Aug 14 21:09:48 2017 +0300
+++ b/Beremiz_service.py Mon Aug 14 21:20:32 2017 +0300
@@ -23,7 +23,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from threading import Thread
@@ -524,7 +526,8 @@
-import threading, traceback
if pyroserver.plcobj is not None:
pyroserver.plcobj.LogMessage(0,'\n'.join(traceback.format_exception(*exp)))
--- a/CodeFileTreeNode.py Mon Aug 14 21:09:48 2017 +0300
+++ b/CodeFileTreeNode.py Mon Aug 14 21:20:32 2017 +0300
@@ -23,7 +23,9 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-import os, re, traceback
from copy import deepcopy
--- a/ConfigTreeNode.py Mon Aug 14 21:09:48 2017 +0300
+++ b/ConfigTreeNode.py Mon Aug 14 21:20:32 2017 +0300
@@ -31,7 +31,9 @@
-import os,traceback,types
--- a/IDEFrame.py Mon Aug 14 21:09:48 2017 +0300
+++ b/IDEFrame.py Mon Aug 14 21:20:32 2017 +0300
@@ -22,11 +22,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from types import TupleType
from editors.EditorPanel import EditorPanel
--- a/PLCControler.py Mon Aug 14 21:09:48 2017 +0300
+++ b/PLCControler.py Mon Aug 14 21:20:32 2017 +0300
@@ -27,7 +27,9 @@
from types import StringType, UnicodeType, TupleType
from copy import deepcopy
import util.paths as paths
from time import localtime
--- a/PLCOpenEditor.py Mon Aug 14 21:09:48 2017 +0300
+++ b/PLCOpenEditor.py Mon Aug 14 21:20:32 2017 +0300
@@ -24,7 +24,12 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-import os, sys, platform, time, traceback, getopt
import util.paths as paths
--- a/ProjectController.py Mon Aug 14 21:09:48 2017 +0300
+++ b/ProjectController.py Mon Aug 14 21:20:32 2017 +0300
@@ -26,12 +26,15 @@
Beremiz Project Controller
from types import ListType
from threading import Timer, Lock, Thread
--- a/canfestival/canfestival.py Mon Aug 14 21:09:48 2017 +0300
+++ b/canfestival/canfestival.py Mon Aug 14 21:20:32 2017 +0300
@@ -23,7 +23,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import util.paths as paths
base_folder = paths.AbsParentDir(__file__, 2)
@@ -34,7 +37,9 @@
from nodelist import NodeList
from nodemanager import NodeManager
-import config_utils, gen_cfile, eds_utils
import canfestival_config as local_canfestival_config
from ConfigTreeNode import ConfigTreeNode
from commondialogs import CreateNodeDialog
--- a/canfestival/config_utils.py Mon Aug 14 21:09:48 2017 +0300
+++ b/canfestival/config_utils.py Mon Aug 14 21:20:32 2017 +0300
@@ -650,7 +650,9 @@
if __name__ == "__main__":
--- a/connectors/WAMP/__init__.py Mon Aug 14 21:09:48 2017 +0300
+++ b/connectors/WAMP/__init__.py Mon Aug 14 21:20:32 2017 +0300
@@ -22,7 +22,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-import sys, traceback, atexit
#from twisted.python import log
from twisted.internet import reactor, threads
from autobahn.twisted import wamp
--- a/doc/conf.py Mon Aug 14 21:09:48 2017 +0300
+++ b/doc/conf.py Mon Aug 14 21:20:32 2017 +0300
@@ -11,7 +11,8 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
--- a/docutil/dochtml.py Mon Aug 14 21:09:48 2017 +0300
+++ b/docutil/dochtml.py Mon Aug 14 21:20:32 2017 +0300
@@ -22,7 +22,10 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-import wx, os, wx.html, subprocess
--- a/docutil/docpdf.py Mon Aug 14 21:09:48 2017 +0300
+++ b/docutil/docpdf.py Mon Aug 14 21:20:32 2017 +0300
@@ -22,7 +22,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--- a/docutil/docsvg.py Mon Aug 14 21:09:48 2017 +0300
+++ b/docutil/docsvg.py Mon Aug 14 21:20:32 2017 +0300
@@ -22,7 +22,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-import wx, os, subprocess
""" Return the Inkscape path """
--- a/plcopen/plcopen.py Mon Aug 14 21:09:48 2017 +0300
+++ b/plcopen/plcopen.py Mon Aug 14 21:20:32 2017 +0300
@@ -25,7 +25,8 @@
from collections import OrderedDict
import util.paths as paths
--- a/plcopen/structures.py Mon Aug 14 21:09:48 2017 +0300
+++ b/plcopen/structures.py Mon Aug 14 21:20:32 2017 +0300
@@ -22,7 +22,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from plcopen import LoadProject
from collections import OrderedDict
from definitions import *
--- a/py_ext/PythonFileCTNMixin.py Mon Aug 14 21:09:48 2017 +0300
+++ b/py_ext/PythonFileCTNMixin.py Mon Aug 14 21:20:32 2017 +0300
@@ -23,7 +23,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import util.paths as paths
--- a/runtime/PLCObject.py Mon Aug 14 21:09:48 2017 +0300
+++ b/runtime/PLCObject.py Mon Aug 14 21:20:32 2017 +0300
@@ -23,7 +23,11 @@
from threading import Timer, Thread, Lock, Semaphore, Event
-import ctypes, os, commands, types, sys
from targets.typemapping import LogLevelsDefault, LogLevelsCount, TypeTranslator, UnpackDebugBuffer
--- a/runtime/ServicePublisher.py Mon Aug 14 21:09:48 2017 +0300
+++ b/runtime/ServicePublisher.py Mon Aug 14 21:20:32 2017 +0300
@@ -21,7 +21,8 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-import socket, threading
from util import Zeroconf
service_type = '_PYRO._tcp.local.'
--- a/svgui/svgui.py Mon Aug 14 21:09:48 2017 +0300
+++ b/svgui/svgui.py Mon Aug 14 21:20:32 2017 +0300
@@ -24,7 +24,9 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from pyjs import translate
--- a/targets/toolchain_gcc.py Mon Aug 14 21:09:48 2017 +0300
+++ b/targets/toolchain_gcc.py Mon Aug 14 21:20:32 2017 +0300
@@ -23,7 +23,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from util.ProcessLogger import ProcessLogger
--- a/targets/toolchain_makefile.py Mon Aug 14 21:09:48 2017 +0300
+++ b/targets/toolchain_makefile.py Mon Aug 14 21:20:32 2017 +0300
@@ -22,7 +22,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from util.ProcessLogger import ProcessLogger
--- a/util/ProcessLogger.py Mon Aug 14 21:09:48 2017 +0300
+++ b/util/ProcessLogger.py Mon Aug 14 21:20:32 2017 +0300
@@ -22,11 +22,13 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-import subprocess, ctypes
from threading import Timer, Lock, Thread, Semaphore
from signal import SIGTERM, SIGKILL
--- a/util/misc.py Mon Aug 14 21:09:48 2017 +0300
+++ b/util/misc.py Mon Aug 14 21:20:32 2017 +0300
@@ -26,7 +26,8 @@
# helper func to check path write permission
--- a/util/paths.py Mon Aug 14 21:09:48 2017 +0300
+++ b/util/paths.py Mon Aug 14 21:20:32 2017 +0300
@@ -22,7 +22,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
if isinstance(file, str):
--- a/version.py Mon Aug 14 21:09:48 2017 +0300
+++ b/version.py Mon Aug 14 21:20:32 2017 +0300
@@ -23,7 +23,9 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import util.paths as paths
def GetCommunityHelpMsg():
--- a/wxglade_hmi/wxglade_hmi.py Mon Aug 14 21:09:48 2017 +0300
+++ b/wxglade_hmi/wxglade_hmi.py Mon Aug 14 21:20:32 2017 +0300
@@ -24,7 +24,9 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from xml.dom import minidom
import util.paths as paths
--- a/xmlclass/xmlclass.py Mon Aug 14 21:09:48 2017 +0300
+++ b/xmlclass/xmlclass.py Mon Aug 14 21:20:32 2017 +0300
@@ -22,7 +22,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--- a/xmlclass/xsdschema.py Mon Aug 14 21:09:48 2017 +0300
+++ b/xmlclass/xsdschema.py Mon Aug 14 21:20:32 2017 +0300
@@ -22,7 +22,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
from xml.dom import minidom