Cope with windows newlines on unix, small improvement in mockTest

rubys · rubys · commit bdcc024970af · 2007-05-28T10:32:25.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40629
diff --git a/tests/test_serializer.py b/tests/test_serializer.py
@@ -13,7 +13,7 @@ class simplejson:
         def load(f):
             true, false = True, False
             input=re.sub(r'(".*?(?<!\\)")',r'u\1',f.read().decode('utf-8'))
-            return eval(input)
+            return eval(input.replace('\r',''))
         load = staticmethod(load)
 
 #RELEASE remove
@@ -44,10 +44,7 @@ def addTest(cls, name, expected, input, description, options):
     def mockTest(self, expected, input, options):
         exception = None
         result = self.serialize_html(input, options)
-        for alternative in expected:
-            if alternative == result:
-                break
-        else:
+        if result not in expected:
             if options.get("omit_optional_tags", True):
                 options["omit_optional_tags"] = False
                 self.assertEquals(self.serialize_html(input, options), result)
