[webkitpy] Refactor diff_parser.py

Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py

Index: Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py
diff --git a/Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py b/Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py
index 7c4ee088545ec368ff79a450c79a1c1a31395188..2460ba9f5a9a870a61b5e9c5e182798de205a26c 100644
--- a/Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py
+++ b/Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py
@@ -27,7 +27,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import cStringIO as StringIO
-import diff_parser
+from diff_parser import DiffParser
 import re
 import unittest
 
@@ -38,7 +38,7 @@ class DiffParserTest(unittest.TestCase):
 
     def test_diff_parser(self, parser = None):
         if not parser:
-            parser = diff_parser.DiffParser(DIFF_TEST_DATA.splitlines())
+            parser = DiffParser(DIFF_TEST_DATA.splitlines())
         self.assertEqual(3, len(parser.files))
 
         self.assertTrue('WebCore/rendering/style/StyleFlexibleBoxData.h' in parser.files)
@@ -99,9 +99,9 @@ class DiffParserTest(unittest.TestCase):
             "+++ Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
             "@@ -59,6 +59,7 @@ def git_diff_to_svn_diff(line):\n",
             ]
-        self.assertEqual(diff_parser.get_diff_converter(svn_diff_lines), diff_parser.svn_diff_to_svn_diff)
-        self.assertEqual(diff_parser.get_diff_converter(comment_lines + svn_diff_lines), diff_parser.svn_diff_to_svn_diff)
-        self.assertEqual(diff_parser.get_diff_converter(revision_lines + svn_diff_lines), diff_parser.svn_diff_to_svn_diff)
+        self.assertEqual(DiffParser.get_diff_converter(svn_diff_lines), DiffParser.svn_diff_to_svn_diff)
+        self.assertEqual(DiffParser.get_diff_converter(comment_lines + svn_diff_lines), DiffParser.svn_diff_to_svn_diff)
+        self.assertEqual(DiffParser.get_diff_converter(revision_lines + svn_diff_lines), DiffParser.svn_diff_to_svn_diff)
 
         git_diff_lines = [
             "diff --git a/Tools/Scripts/webkitpy/common/checkout/diff_parser.py b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
@@ -110,9 +110,9 @@ class DiffParserTest(unittest.TestCase):
             "+++ b/Tools/Scripts/webkitpy/common/checkout/diff_parser.py\n",
             "@@ -59,6 +59,7 @@ def git_diff_to_svn_diff(line):\n",
             ]
-        self.assertEqual(diff_parser.get_diff_converter(git_diff_lines), diff_parser.git_diff_to_svn_diff)
-        self.assertEqual(diff_parser.get_diff_converter(comment_lines + git_diff_lines), diff_parser.git_diff_to_svn_diff)
-        self.assertEqual(diff_parser.get_diff_converter(revision_lines + git_diff_lines), diff_parser.git_diff_to_svn_diff)
+        self.assertEqual(DiffParser.get_diff_converter(git_diff_lines), DiffParser.git_diff_to_svn_diff)
+        self.assertEqual(DiffParser.get_diff_converter(comment_lines + git_diff_lines), DiffParser.git_diff_to_svn_diff)
+        self.assertEqual(DiffParser.get_diff_converter(revision_lines + git_diff_lines), DiffParser.git_diff_to_svn_diff)
 
     def test_git_mnemonicprefix(self):
         p = re.compile(r' ([a|b])/')
@@ -127,7 +127,7 @@ class DiffParserTest(unittest.TestCase):
 
         for prefix in prefixes:
             patch = p.sub(lambda x: " %s/" % prefix[x.group(1)], DIFF_TEST_DATA)
-            self.test_diff_parser(diff_parser.DiffParser(patch.splitlines()))
+            self.test_diff_parser(DiffParser(patch.splitlines()))
 
     def test_git_diff_to_svn_diff(self):
         output = """\
@@ -171,5 +171,5 @@ index b48b162..f300960 100644
  F
 """)
 
-        self.assertMultiLineEqual(output, ''.join(diff_parser.git_diff_to_svn_diff(x) for x in shortfmt.readlines()))
-        self.assertMultiLineEqual(output, ''.join(diff_parser.git_diff_to_svn_diff(x) for x in inputfmt.readlines()))
+        self.assertMultiLineEqual(output, ''.join(DiffParser.git_diff_to_svn_diff(x) for x in shortfmt.readlines()))
+        self.assertMultiLineEqual(output, ''.join(DiffParser.git_diff_to_svn_diff(x) for x in inputfmt.readlines()))