~pythonregexp2.7/python/issue2636-11

« back to all changes in this revision

Viewing changes to Lib/email/base64mime.py

  • Committer: Jeffrey C. "The TimeHorse" Jacobs
  • Date: 2008-09-21 17:53:26 UTC
  • mfrom: (39025.1.14 Regexp-2.7)
  • Revision ID: darklord@timehorse.com-20080921175326-92vaej2hc3yuecxb
Merged in changes from the core Regexp branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
145
145
        # BAW: should encode() inherit b2a_base64()'s dubious behavior in
146
146
        # adding a newline to the encoded string?
147
147
        enc = b2a_base64(s[i:i + max_unencoded])
148
 
        if enc.endswith(NL) and eol <> NL:
 
148
        if enc.endswith(NL) and eol != NL:
149
149
            enc = enc[:-1] + eol
150
150
        encvec.append(enc)
151
151
    return EMPTYSTRING.join(encvec)