From 1c30aa2292d244026afc8bf36455ef12deb0760a Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Sat, 1 Jun 2002 05:49:17 +0000 Subject: [PATCH] The _compat modules now export _floordiv() instead of _intdiv2() for better code reuse. _split() Use _floordiv(). --- Lib/email/Header.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Lib/email/Header.py b/Lib/email/Header.py index 95b5a376116..714839ede5a 100644 --- a/Lib/email/Header.py +++ b/Lib/email/Header.py @@ -9,10 +9,10 @@ import email.base64MIME from email.Charset import Charset try: - from email._compat22 import _intdiv2 + from email._compat22 import _floordiv except SyntaxError: # Python 2.1 spells integer division differently - from email._compat21 import _intdiv2 + from email._compat21 import _floordiv CRLFSPACE = '\r\n ' CRLF = '\r\n' @@ -168,9 +168,8 @@ class Header: last = charset.from_splittable(splittable[splitpnt:], 0) return self._split(first, charset) + self._split(last, charset) else: - # Divide and conquer. BAW: halfway depends on integer division. - # When porting to Python 2.2, use the // operator. - halfway = _intdiv2(len(splittable)) + # Divide and conquer. + halfway = _floordiv(len(splittable), 2) first = charset.from_splittable(splittable[:halfway], 0) last = charset.from_splittable(splittable[halfway:], 0) return self._split(first, charset) + self._split(last, charset)