Cleaned up Py23DocChecker

conestack · Feb 8, 2019 · 3ef3106 · 3ef3106
1 parent 86a55ec
commit 3ef3106
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -12,6 +12,7 @@ History
   - replaced print statement
   - mangled doctests, added Py23DocChecker
   - fixed boolean value of AccountExpired
+  [reinhardt]
 
 
 1.0b8 (2018-10-22)

diff --git a/src/node/ext/ldap/tests.py b/src/node/ext/ldap/tests.py
@@ -41,17 +41,12 @@
 
 
 class Py23DocChecker(doctest.OutputChecker):
-    exclude = [
-        #"<.*>$",  # object repr
-        #"^\S*Error: ",  # raised error
-    ]
 
     def check_output(self, want, got, optionflags):
         if want != got and six.PY2:
             # if running on py2, ignore any "u" prefixes in the output
-            if not any(re.match(pattern, want) for pattern in self.exclude):
-                got = re.sub("(\\W|^)u'(.*?)'", "\\1'\\2'", got)
-                got = re.sub("(\\W|^)u\"(.*?)\"", "\\1\"\\2\"", got)
+            got = re.sub("(\\W|^)u'(.*?)'", "\\1'\\2'", got)
+            got = re.sub("(\\W|^)u\"(.*?)\"", "\\1\"\\2\"", got)
             # also ignore "b" prefixes in the expected output
             want = re.sub("b'(.*?)'", "'\\1'", want)
             # we get 'ldap.' prefixes on python 3, e.g.