[Python-checkins] r77311 - in python/trunk/Lib: email/test/test_email.py email/test/test_email_renamed.py test/test_wsgiref.py

[antoine.pitrou]

Author: antoine.pitrou
Date: Tue Jan  5 00:28:16 2010
New Revision: 77311

Log:
Kill a couple of "<>"



Modified:
   python/trunk/Lib/email/test/test_email.py
   python/trunk/Lib/email/test/test_email_renamed.py
   python/trunk/Lib/test/test_wsgiref.py

Modified: python/trunk/Lib/email/test/test_email.py
==============================================================================
--- python/trunk/Lib/email/test/test_email.py	(original)
+++ python/trunk/Lib/email/test/test_email.py	Tue Jan  5 00:28:16 2010
@@ -51,7 +51,7 @@
 class TestEmailBase(unittest.TestCase):
     def ndiffAssertEqual(self, first, second):
         """Like assertEqual except use ndiff for readable output."""
-        if first <> second:
+        if first != second:
             sfirst = str(first)
             ssecond = str(second)
             diff = difflib.ndiff(sfirst.splitlines(), ssecond.splitlines())
@@ -2775,7 +2775,7 @@
         # Try a charset with None body encoding
         c = Charset('us-ascii')
         eq('hello world', c.body_encode('hello world'))
-        # Try the convert argument, where input codec <> output codec
+        # Try the convert argument, where input codec != output codec
         c = Charset('euc-jp')
         # With apologies to Tokio Kikuchi ;)
         try:

Modified: python/trunk/Lib/email/test/test_email_renamed.py
==============================================================================
--- python/trunk/Lib/email/test/test_email_renamed.py	(original)
+++ python/trunk/Lib/email/test/test_email_renamed.py	Tue Jan  5 00:28:16 2010
@@ -52,7 +52,7 @@
 class TestEmailBase(unittest.TestCase):
     def ndiffAssertEqual(self, first, second):
         """Like assertEqual except use ndiff for readable output."""
-        if first <> second:
+        if first != second:
             sfirst = str(first)
             ssecond = str(second)
             diff = difflib.ndiff(sfirst.splitlines(), ssecond.splitlines())
@@ -2770,7 +2770,7 @@
         # Try a charset with None body encoding
         c = Charset('us-ascii')
         eq('hello world', c.body_encode('hello world'))
-        # Try the convert argument, where input codec <> output codec
+        # Try the convert argument, where input codec != output codec
         c = Charset('euc-jp')
         # With apologies to Tokio Kikuchi ;)
         try:

Modified: python/trunk/Lib/test/test_wsgiref.py
==============================================================================
--- python/trunk/Lib/test/test_wsgiref.py	(original)
+++ python/trunk/Lib/test/test_wsgiref.py	Tue Jan  5 00:28:16 2010
@@ -523,7 +523,7 @@
             "Content-Length: %d\r\n"
             "\r\n%s" % (h.error_status,len(h.error_body),h.error_body))
 
-        self.assertTrue(h.stderr.getvalue().find("AssertionError")<>-1)
+        self.assertNotEqual(h.stderr.getvalue().find("AssertionError"), -1)
 
     def testErrorAfterOutput(self):
         MSG = "Some output has been sent"
@@ -536,7 +536,7 @@
         self.assertEqual(h.stdout.getvalue(),
             "Status: 200 OK\r\n"
             "\r\n"+MSG)
-        self.assertTrue(h.stderr.getvalue().find("AssertionError")<>-1)
+        self.assertNotEqual(h.stderr.getvalue().find("AssertionError"), -1)
 
 
     def testHeaderFormats(self):