mirror of
https://github.com/python/cpython.git
synced 2025-11-03 03:22:27 +00:00
encode_7or8bit(): Clearing out some old patches; iso-2202 is non-ASCII but
still 7-bit.
This commit is contained in:
parent
4e59bc1e67
commit
61e5616d74
1 changed files with 10 additions and 5 deletions
|
|
@ -1,8 +1,7 @@
|
||||||
# Copyright (C) 2001,2002 Python Software Foundation
|
# Copyright (C) 2001-2004 Python Software Foundation
|
||||||
# Author: barry@zope.com (Barry Warsaw)
|
# Author: barry@python.org (Barry Warsaw)
|
||||||
|
|
||||||
"""Module containing encoding functions for Image.Image and Text.Text.
|
"""Encodings and related functions."""
|
||||||
"""
|
|
||||||
|
|
||||||
import base64
|
import base64
|
||||||
|
|
||||||
|
|
@ -84,7 +83,13 @@ def encode_7or8bit(msg):
|
||||||
try:
|
try:
|
||||||
orig.encode('ascii')
|
orig.encode('ascii')
|
||||||
except UnicodeError:
|
except UnicodeError:
|
||||||
msg['Content-Transfer-Encoding'] = '8bit'
|
# iso-2022-* is non-ASCII but still 7-bit
|
||||||
|
charset = msg.get_charset()
|
||||||
|
output_cset = charset and charset.output_charset
|
||||||
|
if output_cset and output_cset.lower().startswith('iso-2202-'):
|
||||||
|
msg['Content-Transfer-Encoding'] = '7bit'
|
||||||
|
else:
|
||||||
|
msg['Content-Transfer-Encoding'] = '8bit'
|
||||||
else:
|
else:
|
||||||
msg['Content-Transfer-Encoding'] = '7bit'
|
msg['Content-Transfer-Encoding'] = '7bit'
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue