Use IGNORE_EXCEPTION_DETAIL instead of gross hack

djc · djc · commit e0ab797a7e05 · 2014-07-06T16:24:49.000+02:00
diff --git a/couchdb/client.py b/couchdb/client.py
@@ -533,7 +533,7 @@ def delete(self, doc):
         >>> doc2 = db['johndoe']
         >>> doc2['age'] = 42
         >>> db['johndoe'] = doc2
-        >>> db.delete(doc)
+        >>> db.delete(doc) # doctest: +IGNORE_EXCEPTION_DETAIL
         Traceback (most recent call last):
           ...
         ResourceConflict: (u'conflict', u'Document update conflict.')
diff --git a/couchdb/tests/testutil.py b/couchdb/tests/testutil.py
@@ -18,8 +18,6 @@ def check_output(self, want, got, optionflags):
         if sys.version_info[0] > 2:
             want = re.sub("u'(.*?)'", "'\\1'", want)
             want = re.sub('u"(.*?)"', '"\\1"', want)
-            want = want.replace('ResourceConflict:',
-                                'couchdb.http.ResourceConflict:')
         return doctest.OutputChecker.check_output(self, want, got, optionflags)
 
 def doctest_suite(mod):
