Fix for Issue 19 by greatred

git-svn-id: http://pymox.googlecode.com/svn/trunk@59 b1010a0a-674b-0410-b734-77272b80c875

1 files changed, 7 insertions, 1 deletions

diff --git a/mox.py b/mox.py
index f8a6776..c5f8bf0 100755
--- a/mox.py
+++ b/mox.py
@@ -130,7 +130,7 @@ class UnexpectedMethodCallError(Error):
       diff = differ.compare(str(unexpected_method).splitlines(True),
                             str(expected).splitlines(True))
       self._str = ("Unexpected method call.  unexpected:-  expected:+\n%s"
-                   % ("\n".join(diff),))
+                   % ("\n".join(line.rstrip() for line in diff),))
 
   def __str__(self):
     return self._str
@@ -1780,6 +1780,12 @@ class UnorderedGroup(MethodGroup):
     super(UnorderedGroup, self).__init__(group_name)
     self._methods = []
 
+  def __str__(self):
+    return '%s "%s" pending calls:\n%s' % (
+        self.__class__.__name__,
+        self._group_name,
+        "\n".join(str(method) for method in self._methods))
+
   def AddMethod(self, mock_method):
     """Add a method to this group.