mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-12 23:16:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Importing Charset should not fail when Unicode is disabled. (XXX

Browse source 
Using Unicode-aware methods may still die with a NameError on unicode.
Maybe there's a more elegant solution but I doubt anybody cares.)
This commit is contained in:
Guido van Rossum 2002-05-28 18:49:03 +00:00
parent 05459c5e5e
commit 1a7ac359a0
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/email/Charset.py
View file

@ -1,7 +1,15 @@
# Copyright (C) 2001,2002 Python Software Foundation # Copyright (C) 2001,2002 Python Software Foundation
# Author: che@debian.org (Ben Gertzfield) # Author: che@debian.org (Ben Gertzfield)
from types import UnicodeType try:
unicode
except NameError:
def _is_unicode(x):
return 1==0
else:
def _is_unicode(x):
return isinstance(x, unicode)
from email.Encoders import encode_7or8bit from email.Encoders import encode_7or8bit
import email.base64MIME import email.base64MIME
import email.quopriMIME import email.quopriMIME
@ -226,7 +234,7 @@ class Charset:
Characters that could not be converted to Unicode will be replaced Characters that could not be converted to Unicode will be replaced
with the Unicode replacement character U+FFFD. with the Unicode replacement character U+FFFD.
""" """
if isinstance(s, UnicodeType) or self.input_codec is None: if _is_unicode(s) or self.input_codec is None:
return s return s
try: try:
return unicode(s, self.input_codec, 'replace') return unicode(s, self.input_codec, 'replace')
@ -254,7 +262,7 @@ class Charset:
codec = self.output_codec codec = self.output_codec
else: else:
codec = self.input_codec codec = self.input_codec
if not isinstance(ustr, UnicodeType) or codec is None: if not _is_unicode(ustr) or codec is None:
return ustr return ustr
try: try:
return ustr.encode(codec, 'replace') return ustr.encode(codec, 'replace')