summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-01-04 23:28:16 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-01-04 23:28:16 (GMT)
commitaf45b11527de9ade4e6e806a8560551652c2eb20 (patch)
tree3c1cc3c393c8a2b105e6bac8ab61f06fdb0ef0eb
parentb9d4963a989accce30234b7b74bce874c0142209 (diff)
downloadcpython-af45b11527de9ade4e6e806a8560551652c2eb20.zip
cpython-af45b11527de9ade4e6e806a8560551652c2eb20.tar.gz
cpython-af45b11527de9ade4e6e806a8560551652c2eb20.tar.bz2
Kill a couple of "<>"
-rw-r--r--Lib/email/test/test_email.py4
-rw-r--r--Lib/email/test/test_email_renamed.py4
-rwxr-xr-xLib/test/test_wsgiref.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index 5aa8463..c25635b 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -51,7 +51,7 @@ def openfile(filename, mode='r'):
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 @@ class TestCharset(unittest.TestCase):
# 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:
diff --git a/Lib/email/test/test_email_renamed.py b/Lib/email/test/test_email_renamed.py
index 928d251..e5f0b13 100644
--- a/Lib/email/test/test_email_renamed.py
+++ b/Lib/email/test/test_email_renamed.py
@@ -52,7 +52,7 @@ def openfile(filename, mode='r'):
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 @@ class TestCharset(unittest.TestCase):
# 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:
diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py
index b638391..a3bc99f 100755
--- a/Lib/test/test_wsgiref.py
+++ b/Lib/test/test_wsgiref.py
@@ -523,7 +523,7 @@ class HandlerTests(TestCase):
"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 @@ class HandlerTests(TestCase):
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):