_intdiv2() -> _floordiv(), merge of uncommitted changes.

diff --git a/Lib/email/_compat21.py b/Lib/email/_compat21.py
index 478d2768cf80efc1f794775fd913621617e1e3d6..76d6f502bc23887299bfa7e85e76985388daf6d2 100644 (file)
--- a/Lib/email/_compat21.py
+++ b/Lib/email/_compat21.py
@@ -24,10 +24,10 @@ def walk(self):
     return parts
 
 
-# Used internally by the Header class
-def _floordiv(x, y):
-    """Do integer division."""
-    return x / y
+# Python 2.2 spells floor division //
+def _floordiv(i, j):
+    """Do a floor division, i/j."""
+    return i / j
 
 
 \f

diff --git a/Lib/email/_compat22.py b/Lib/email/_compat22.py
index c88007cb4c71490657efa782e9a142f6e444fc5e..258156805bff36086b43f7239af686c8999fe224 100644 (file)
--- a/Lib/email/_compat22.py
+++ b/Lib/email/_compat22.py
@@ -25,10 +25,10 @@ def walk(self):
                 yield subsubpart
 
 
-# Used internally by the Header class
-def _floordiv(x, y):
-    """Do integer division."""
-    return x // y
+# Python 2.2 spells floor division //
+def _floordiv(i, j):
+    """Do a floor division, i/j."""
+    return i // j
 
 
 \f