From 6fa21b52ae36e2b4b44427fd1e156e7f65d8ad2f Mon Sep 17 00:00:00 2001 From: Rustam Zaitov Date: Mon, 28 Oct 2013 00:12:37 +0400 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=E2=80=93=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=B8=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/UnitTests/ProjectParser/test_projectLineParser.py | 4 ++-- scripts/parser/ProjectParser/ProjectLineParser.py | 2 +- scripts/parser/ProjectParser/ProjectParser.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/UnitTests/ProjectParser/test_projectLineParser.py b/scripts/UnitTests/ProjectParser/test_projectLineParser.py index 79385ba..d26eb9c 100644 --- a/scripts/UnitTests/ProjectParser/test_projectLineParser.py +++ b/scripts/UnitTests/ProjectParser/test_projectLineParser.py @@ -32,7 +32,7 @@ class TestCsprojParser(unittest.TestCase): def test_parse_keyedCsprojLine(self): statement = r"csproj app:coolApp key:CodesignKey 'iPhone Developer: Рустам Заитов (CTL85FZX6K)'" - setting = self.parser.parse(statement) + setting = self.parser.parseLine(statement) self.assertEqual(setting.projectName, 'coolApp') self.assertEqual(setting.key, 'CodesignKey') @@ -40,7 +40,7 @@ class TestCsprojParser(unittest.TestCase): def test_parse_attributedCsprojLine(self): statement = r"csproj app:coolApp rel_path '../parent_dir/some_file.extension'" - setting = self.parser.parse(statement) + setting = self.parser.parseLine(statement) self.assertEqual(setting.projectName, 'coolApp') self.assertEqual(setting.attribute_name, 'rel_path') diff --git a/scripts/parser/ProjectParser/ProjectLineParser.py b/scripts/parser/ProjectParser/ProjectLineParser.py index 11c5873..36f68ec 100644 --- a/scripts/parser/ProjectParser/ProjectLineParser.py +++ b/scripts/parser/ProjectParser/ProjectLineParser.py @@ -9,7 +9,7 @@ class ProjectLineParser: self._value_provider = value_provider self._command_token = command_token - def parse(self, line): + def parseLine(self, line): ws = ' ' cmd_name_regexp = "^(?P{0})".format(self._command_token) app_regexp = r"(?Papp:\S+)" diff --git a/scripts/parser/ProjectParser/ProjectParser.py b/scripts/parser/ProjectParser/ProjectParser.py index 9322faa..fd26482 100644 --- a/scripts/parser/ProjectParser/ProjectParser.py +++ b/scripts/parser/ProjectParser/ProjectParser.py @@ -33,6 +33,6 @@ class ProjectParser: def __parse_line(self, line): line_parser = ProjectLineParser(self._value_provider, self._command_token) - setting = line_parser.parse(line) + setting = line_parser.parseLine(line) return setting \ No newline at end of file