diff --git a/Sources/pyOpenRPA/Robot/UIDesktop.py b/Sources/pyOpenRPA/Robot/UIDesktop.py index de74416f..d18da2c6 100644 --- a/Sources/pyOpenRPA/Robot/UIDesktop.py +++ b/Sources/pyOpenRPA/Robot/UIDesktop.py @@ -1,23 +1,11 @@ from pywinauto import win32defines, win32structures, win32functions -import pdb import pywinauto -import json -import sys import ctypes import struct -import os -import select -import zlib import win32api -import win32clipboard import time -import traceback -from . import ProcessCommunicator -from . import JSONNormalize +from .Utils import ProcessCommunicator from . import Utils #For ProcessBitness -from threading import Timer -import datetime -import logging import re import copy diff --git a/Sources/pyOpenRPA/Robot/JSONNormalize.py b/Sources/pyOpenRPA/Robot/Utils/JSONNormalize.py similarity index 100% rename from Sources/pyOpenRPA/Robot/JSONNormalize.py rename to Sources/pyOpenRPA/Robot/Utils/JSONNormalize.py diff --git a/Sources/pyOpenRPA/Robot/ProcessCommunicator.py b/Sources/pyOpenRPA/Robot/Utils/ProcessCommunicator.py similarity index 99% rename from Sources/pyOpenRPA/Robot/ProcessCommunicator.py rename to Sources/pyOpenRPA/Robot/Utils/ProcessCommunicator.py index 1389ec52..1af5f2e8 100644 --- a/Sources/pyOpenRPA/Robot/ProcessCommunicator.py +++ b/Sources/pyOpenRPA/Robot/Utils/ProcessCommunicator.py @@ -1,10 +1,9 @@ import json -import subprocess import zlib import sys -import os from . import JSONNormalize -import pdb + + ############################################ ####Межпроцессное взаимодействие ############################################ diff --git a/Sources/pyOpenRPA/Robot/ValueVerify.py b/Sources/pyOpenRPA/Robot/Utils/ValueVerify.py similarity index 100% rename from Sources/pyOpenRPA/Robot/ValueVerify.py rename to Sources/pyOpenRPA/Robot/Utils/ValueVerify.py diff --git a/Sources/pyOpenRPA/Robot/__init__.py b/Sources/pyOpenRPA/Robot/__init__.py index 101da7c5..5e1beb6a 100644 --- a/Sources/pyOpenRPA/Robot/__init__.py +++ b/Sources/pyOpenRPA/Robot/__init__.py @@ -4,10 +4,9 @@ The OpenRPA package (from UnicodeLabs) """ __all__ = [ - 'UIDesktop', 'Clipboard', 'IntegrationOrchestrator', 'Window', 'ProcessCommunicator' + 'Clipboard', 'IntegrationOrchestrator', 'Window' ] __author__ = 'Ivan Maslov ' #from . import UIDesktop from . import Clipboard from . import Window -from . import ProcessCommunicator \ No newline at end of file diff --git a/Sources/pyOpenRPA/Robot/__main__.py b/Sources/pyOpenRPA/Robot/__main__.py index 338537e6..5c62d452 100644 --- a/Sources/pyOpenRPA/Robot/__main__.py +++ b/Sources/pyOpenRPA/Robot/__main__.py @@ -8,8 +8,8 @@ lFolderPath = "\\".join(__file__.split("\\")[:-2]) sys.path.append(lFolderPath) ################################ import traceback -from Robot import ProcessCommunicator -from Robot import JSONNormalize +from Robot.Utils import ProcessCommunicator +from Robot.Utils import JSONNormalize from Robot import UIDesktop ########################################## #Run UIDesktop from new process. Communication with paren process by PIPE channel