aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2006-08-24 03:53:23 +0000
committerGuido van Rossum <guido@python.org>2006-08-24 03:53:23 +0000
commitb053cd8f40dd19985b16f50661640dcefb69888f (patch)
tree88e1c2ce636a6df402a97c51ea9067a46735120a /Lib/email/charset.py
parentAnna Ravenscroft identified many occurrences of "file" used to open a file (diff)
downloadcpython-b053cd8f40dd19985b16f50661640dcefb69888f.tar.gz
cpython-b053cd8f40dd19985b16f50661640dcefb69888f.tar.bz2
cpython-b053cd8f40dd19985b16f50661640dcefb69888f.zip
Killed the <> operator. You must now use !=.
Opportunistically also fixed one or two places where '<> None' should be 'is not None' and where 'type(x) <> y' should be 'not isinstance(x, y)'.
Diffstat (limited to 'Lib/email/charset.py')
-rw-r--r--Lib/email/charset.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/email/charset.py b/Lib/email/charset.py
index 8f218b2095b..882aa420ce0 100644
--- a/Lib/email/charset.py
+++ b/Lib/email/charset.py
@@ -250,7 +250,7 @@ class Charset:
Returns "base64" if self.body_encoding is BASE64.
Returns "7bit" otherwise.
"""
- assert self.body_encoding <> SHORTEST
+ assert self.body_encoding != SHORTEST
if self.body_encoding == QP:
return 'quoted-printable'
elif self.body_encoding == BASE64:
@@ -260,7 +260,7 @@ class Charset:
def convert(self, s):
"""Convert a string from the input_codec to the output_codec."""
- if self.input_codec <> self.output_codec:
+ if self.input_codec != self.output_codec:
return unicode(s, self.input_codec).encode(self.output_codec)
else:
return s