summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2016-09-08 22:21:27 -0400
committerR David Murray <rdmurray@bitdance.com>2016-09-08 22:21:27 -0400
commitf724e3a6318ecb7a515058665fd1a82fce04d5ef (patch)
treec1ccefc5b55ab55563108d8291eeac9e3e4db258
parentafbc18a1fec3a1282961624bd85088b855d0a825 (diff)
downloadcpython-f724e3a6318ecb7a515058665fd1a82fce04d5ef.tar.gz
#27630: Be consistent in how _XXX/_encoded_XXX vars are initialized.
-rw-r--r--Lib/email/generator.py10
1 files changed, 1 insertions, 9 deletions
diff --git a/Lib/email/generator.py b/Lib/email/generator.py
index 11ff16df9a..6d283e9add 100644
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -97,7 +97,7 @@ class Generator:
self._NL = policy.linesep
self._encoded_NL = self._encode(self._NL)
self._EMPTY = ''
- self._encoded_EMTPY = self._encode('')
+ self._encoded_EMPTY = self._encode(self._EMPTY)
# Because we use clone (below) when we recursively process message
# subparts, and because clone uses the computed policy (not None),
# submessages will automatically get set to the computed policy when
@@ -137,10 +137,6 @@ class Generator:
# it has already transformed the input; but, since this whole thing is a
# hack anyway this seems good enough.
- # Similarly, we have _XXX and _encoded_XXX attributes that are used on
- # source and buffer data, respectively.
- _encoded_EMPTY = ''
-
def _new_buffer(self):
# BytesGenerator overrides this to return BytesIO.
return StringIO()
@@ -402,10 +398,6 @@ class BytesGenerator(Generator):
The outfp object must accept bytes in its write method.
"""
- # Bytes versions of this constant for use in manipulating data from
- # the BytesIO buffer.
- _encoded_EMPTY = b''
-
def write(self, s):
self._fp.write(s.encode('ascii', 'surrogateescape'))