Merge branch 'BS-28'

scripts/TouchinBuild/Core/FileContentProvider.py

@@ -3,7 +3,7 @@ class FileContentProvider:
 		pass
 
 	def fetchContent(self, path):
-		file = open(path)
-		content = file.read()
+		f = open(path)
+		content = f.read()
 
 		return content

scripts/TouchinBuild/Core/LineConveyor/CommentRemover.py

@@ -1,4 +1,7 @@
 class CommentRemover:
+	def __init__(self):
+		pass
+
 	def processText(self, line):
 		assert line is not None
 

scripts/TouchinBuild/Core/LineConveyor/Stripper.py

@@ -1,4 +1,7 @@
 class Stripper:
+	def __init__(self):
+		pass
+
 	def processText(self, line):
 		assert line is not None
 

scripts/TouchinBuild/Tests/ManualTests/csproj_test.py

@@ -1,5 +1,4 @@
 from CommandBuilders.PatchCsprojCommandBuilder import PatchCsprojCommandBuilder
-from commands.ValueProvider import ValueProvider
 
 line = "inside 'BuildSample/BuildSample/CoolApp.csproj' set OutputPath to 'Output' for 'Release|iPhone'"
 

scripts/TouchinBuild/Tests/ManualTests/infoplist_test.py

@@ -12,7 +12,8 @@ config = {
 }
 line = "inside 'BuildSample/BuildSample/Info.plist' set CFBundleDisplayName to 'MyCoolApp'"
 
-value_provider = ValueProvider(config)
+value_provider = ValueProvider()
+value_provider.setConfig(config)
 builder = PatchInfoplistCommandBuilder(value_provider)
 
 command = builder.getCommandFor(line)

scripts/TouchinBuild/Tests/UnitTests/IncludeText/test_includeText.py

@@ -3,6 +3,7 @@ from Core.LineConveyor.TextInclude import TextInclude
 from utils.IncludeProcessor import IncludeProcessor
 
 
+#noinspection PyUnusedLocal
 class MockContentProvider:
 	def __init__(self):
 		pass

scripts/TouchinBuild/commands/ValueProvider.py

@@ -1,4 +1,7 @@
 class ValueProvider:
+	def __init__(self):
+		self.__config = None
+
 	def setConfig(self, config):
 		assert config is not None
 		self.__config = config

scripts/TouchinBuild/taskRunner.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import os
 import argparse
 from Core.FileContentProvider import FileContentProvider
 from Core.LineConveyor.CommentRemover import CommentRemover
@@ -78,7 +77,7 @@ overrideArgs = parser.parse_known_args()[1]
 
 # TODO:  перенести в корень комапановки
 fromFileSettingsProvider = FromFileSettingsProvider()
-settingsProvider = CmdArgsOverriderSettingsProvider(fromFileSettingsProvider, overrideArgs)
+overrideWithCmdSetProvider = CmdArgsOverriderSettingsProvider(fromFileSettingsProvider, overrideArgs)
 
-runner = TaskRunner(settingsProvider)
+runner = TaskRunner(overrideWithCmdSetProvider)
 runner.run()

scripts/TouchinBuild/utils/IncludeProcessor.py

@@ -4,7 +4,7 @@ from parsers.LineParser import LineParser
 
 class IncludeProcessor(LineParser):
 	def __init__(self):
-		pass
+		LineParser.__init__(self)
 
 	def getIncludesInfo(self, text):
 		assert text is not None

scripts/TouchinBuild/utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py

@@ -1,4 +1,3 @@
-import select
 from parsers.SettingsParser.SettingsParser import SettingsParser