From 0758b2e43646925c09f81ea5464eb15c312168d9 Mon Sep 17 00:00:00 2001 From: rzaitov Date: Fri, 1 Nov 2013 17:52:41 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BE=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/SettingsProvider/FromFileSettingsProvider.py | 1 - scripts/build.py | 3 ++- scripts/parser/BackupParser/CreateBackupParser.py | 4 +++- scripts/parser/BackupParser/DeleteBackupParser.py | 4 +++- scripts/parser/BackupParser/RestoreBackupParser.py | 3 ++- scripts/parser/CopyParser/CopyLineParser.py | 4 +++- scripts/parser/InsideParser/InsideRemoveParser.py | 3 ++- scripts/parser/InsideParser/InsideSetParser.py | 4 +++- scripts/parser/MakeDirsParser.py | 4 +++- scripts/parser/SettingsParser/SettingsLineParser.py | 3 ++- scripts/parser/ShParser.py | 4 +++- scripts/run_manual_tests.py | 1 - scripts/utils/PathConverter/path_converter.py | 3 ++- 13 files changed, 28 insertions(+), 13 deletions(-) diff --git a/scripts/SettingsProvider/FromFileSettingsProvider.py b/scripts/SettingsProvider/FromFileSettingsProvider.py index 295b173..65ad292 100644 --- a/scripts/SettingsProvider/FromFileSettingsProvider.py +++ b/scripts/SettingsProvider/FromFileSettingsProvider.py @@ -1,4 +1,3 @@ -import os from parser.SettingsParser.SettingsParser import SettingsParser diff --git a/scripts/build.py b/scripts/build.py index a80dd2e..fe8828a 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -1,9 +1,10 @@ import os import imp +import argparse import settings import instruments -import argparse + keys = instruments.GetConfigKeys(settings.build_ready_configs) diff --git a/scripts/parser/BackupParser/CreateBackupParser.py b/scripts/parser/BackupParser/CreateBackupParser.py index 2e897f6..e45cc5e 100644 --- a/scripts/parser/BackupParser/CreateBackupParser.py +++ b/scripts/parser/BackupParser/CreateBackupParser.py @@ -1,6 +1,8 @@ +import re + from parser.BackupParser.CreateBackupArguments import CreateBackupArguments from parser.LineParser import LineParser -import re + class CreateBackupParser(LineParser): def __init__(self): diff --git a/scripts/parser/BackupParser/DeleteBackupParser.py b/scripts/parser/BackupParser/DeleteBackupParser.py index cf92e91..830a9ef 100644 --- a/scripts/parser/BackupParser/DeleteBackupParser.py +++ b/scripts/parser/BackupParser/DeleteBackupParser.py @@ -1,6 +1,8 @@ -from parser.LineParser import LineParser import re +from parser.LineParser import LineParser + + class DeleteBackupParser(LineParser): def parseLine(self, line): assert line is not None diff --git a/scripts/parser/BackupParser/RestoreBackupParser.py b/scripts/parser/BackupParser/RestoreBackupParser.py index 52ac72b..fe0b3ef 100644 --- a/scripts/parser/BackupParser/RestoreBackupParser.py +++ b/scripts/parser/BackupParser/RestoreBackupParser.py @@ -1,6 +1,7 @@ -from parser.LineParser import LineParser import re +from parser.LineParser import LineParser + class RestoreBackupParser(LineParser): def parseLine(self, line): diff --git a/scripts/parser/CopyParser/CopyLineParser.py b/scripts/parser/CopyParser/CopyLineParser.py index 6166b2f..729f4f2 100644 --- a/scripts/parser/CopyParser/CopyLineParser.py +++ b/scripts/parser/CopyParser/CopyLineParser.py @@ -1,6 +1,8 @@ +import re + from parser.CopyParser.CopyArguments import CopyArguments from parser.LineParser import LineParser -import re + class CopyLineParser(LineParser): def __init__(self): diff --git a/scripts/parser/InsideParser/InsideRemoveParser.py b/scripts/parser/InsideParser/InsideRemoveParser.py index a132ae3..77b7534 100644 --- a/scripts/parser/InsideParser/InsideRemoveParser.py +++ b/scripts/parser/InsideParser/InsideRemoveParser.py @@ -1,6 +1,7 @@ -from parser.LineParser import LineParser import re +from parser.LineParser import LineParser + class InsideRemoveParser(LineParser): def __init__(self, fileExt): diff --git a/scripts/parser/InsideParser/InsideSetParser.py b/scripts/parser/InsideParser/InsideSetParser.py index 5aec1c4..a5ac3ff 100644 --- a/scripts/parser/InsideParser/InsideSetParser.py +++ b/scripts/parser/InsideParser/InsideSetParser.py @@ -1,6 +1,8 @@ -from parser.LineParser import LineParser import re +from parser.LineParser import LineParser + + class InsideSetParser(LineParser): def __init__(self, value_provider, fileExt): assert value_provider is not None diff --git a/scripts/parser/MakeDirsParser.py b/scripts/parser/MakeDirsParser.py index 1366866..cd68c4d 100644 --- a/scripts/parser/MakeDirsParser.py +++ b/scripts/parser/MakeDirsParser.py @@ -1,6 +1,8 @@ -from parser.LineParser import LineParser import re +from parser.LineParser import LineParser + + class MakeDirsParser(LineParser): def parseLine(self, line): pathRegexp = r"'(?P[^']+)'$" diff --git a/scripts/parser/SettingsParser/SettingsLineParser.py b/scripts/parser/SettingsParser/SettingsLineParser.py index b75da52..aaaa872 100644 --- a/scripts/parser/SettingsParser/SettingsLineParser.py +++ b/scripts/parser/SettingsParser/SettingsLineParser.py @@ -1,5 +1,6 @@ -from parser.LineParser import LineParser import re + +from parser.LineParser import LineParser from parser.SettingsParser.PathParser import PathParser diff --git a/scripts/parser/ShParser.py b/scripts/parser/ShParser.py index 0613f21..b284d8c 100644 --- a/scripts/parser/ShParser.py +++ b/scripts/parser/ShParser.py @@ -1,6 +1,8 @@ -from parser.LineParser import LineParser import re +from parser.LineParser import LineParser + + class ShParser(LineParser): def parseLine(self, line): assert line diff --git a/scripts/run_manual_tests.py b/scripts/run_manual_tests.py index 58ccd16..b287fcb 100644 --- a/scripts/run_manual_tests.py +++ b/scripts/run_manual_tests.py @@ -19,4 +19,3 @@ os.chdir(baseDir) #import ManualTests.infoplist_test #import ManualTests.clean_test -import ManualTests.build_test \ No newline at end of file diff --git a/scripts/utils/PathConverter/path_converter.py b/scripts/utils/PathConverter/path_converter.py index d7397cd..36927e4 100644 --- a/scripts/utils/PathConverter/path_converter.py +++ b/scripts/utils/PathConverter/path_converter.py @@ -1,6 +1,7 @@ -import utils.PathConverter.converter_base as cB import os +import utils.PathConverter.converter_base as cB + class PathConverter(cB.ConverterBase): def __init__(self, sln_path):