Rev 5428: More cleanup. in file:///home/vila/src/bzr/reviews/mergetools/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/reviews/mergetools/

------------------------------------------------------------
revno: 5428
revision-id: v.ladeuil+lp at free.fr-20101206140144-yz3cp2paek953gp4
parent: v.ladeuil+lp at free.fr-20101206135015-m33q3gm33vrvxkcu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: mergetools
timestamp: Mon 2010-12-06 15:01:44 +0100
message:
  More cleanup.
-------------- next part --------------
=== modified file 'bzrlib/mergetools.py'
--- a/bzrlib/mergetools.py	2010-12-06 13:50:15 +0000
+++ b/bzrlib/mergetools.py	2010-12-06 14:01:44 +0000
@@ -52,9 +52,7 @@
 class MergeTool(object):
 
     def __init__(self, name, command_line):
-        """Initializes the merge tool with a name and a command-line (a string
-        or sequence of strings).
-        """
+        """Initializes the merge tool with a name and a command-line."""
         self.name = name
         self.command_line = command_line
         self._cmd_list = cmdline.split(self.command_line)

=== modified file 'bzrlib/tests/test_cmdline.py'
--- a/bzrlib/tests/test_cmdline.py	2010-12-06 10:01:50 +0000
+++ b/bzrlib/tests/test_cmdline.py	2010-12-06 14:01:44 +0000
@@ -113,13 +113,3 @@
         self.assertAsTokens([(False, r'\\"'), (False, r'*.py')],
                             r'\\\\\" *.py')
         self.assertAsTokens([(True, u'\\\\')], u'"\\\\')
-
-
-class TestUnSplit(tests.TestCase):
-
-    def test_unsplit(self):
-        self.assertEquals('foo bar', cmdline.unsplit(['foo', 'bar']))
-
-    def test_unsplit_quotes(self):
-        self.assertEquals('foo "woo hoo" bar',
-                          cmdline.unsplit(['foo', 'woo hoo', 'bar']))