svn commit: r1004710 - /subversion/trunk/subversion/tests/cmdline/svntest/verify.py

[pe...@apache.org]

Author: peters
Date: Tue Oct  5 16:50:03 2010
New Revision: 1004710

URL: http://svn.apache.org/viewvc?rev=1004710&view=rev
Log:
* subversion/tests/cmdline/svntest/verify.py
  (ExpectedOutput.__cmp__, UnorderedOutput.__cmp__): Raise Exception
   objects instead of bare strings, which Python 2.6 no longer allows.

...Though I note this is academic.  You get an exception either way,
just a question of whether it's yours or Python's.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/verify.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/verify.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/verify.py?rev=1004710&r1=1004709&r2=1004710&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/verify.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/verify.py Tue Oct  5 16:50:03 2010
@@ -106,7 +106,7 @@ class ExpectedOutput:
     return str(self.output)
 
   def __cmp__(self, other):
-    raise 'badness'
+    raise Exception('badness')
 
   def matches(self, other, except_re=None):
     """Return whether SELF.output matches OTHER (which may be a list
@@ -236,7 +236,7 @@ class UnorderedOutput(ExpectedOutput):
   is_unordered = True
 
   def __cmp__(self, other):
-    raise 'badness'
+    raise Exception('badness')
 
   def is_equivalent_list(self, expected, actual):
     "Disregard the order of ACTUAL lines during comparison."