The usual...

diff --git a/Lib/dos-8x3/formatte.py b/Lib/dos-8x3/formatte.py
index 79be0f64e35b75cddb5126e9fb5a1ac64515b33c..507ed8a6fafae38f4cfd32b5c8016cc2f84e5061 100755 (executable)
--- a/Lib/dos-8x3/formatte.py
+++ b/Lib/dos-8x3/formatte.py
@@ -16,9 +16,8 @@ class NullFormatter:
        self.writer = writer
     def end_paragraph(self, blankline): pass
     def add_line_break(self): pass
-    def add_hor_rule(self, abswidth=None, percentwidth=1.0,
-                    height=None, align=None): pass
-    def add_label_data(self, format, counter): pass
+    def add_hor_rule(self, *args, **kw): pass
+    def add_label_data(self, format, counter, blankline=None): pass
     def add_flowing_data(self, data): pass
     def add_literal_data(self, data): pass
     def flush_softspace(self): pass

diff --git a/Lib/dos-8x3/macurl2p.py b/Lib/dos-8x3/macurl2p.py
index 65afe69c13a9824ed3d87697d1898bda9617baf3..7d53d624aa7296d1e4cddc643ea4c098e80ad185 100755 (executable)
--- a/Lib/dos-8x3/macurl2p.py
+++ b/Lib/dos-8x3/macurl2p.py
@@ -1,4 +1,5 @@
-"""Mac specific module for conversion between pathnames and URLs."""
+"""Mac specific module for conversion between pathnames and URLs.
+Do not import directly, use urllib instead."""
 
 import string
 import urllib

diff --git a/Lib/dos_8x3/formatte.py b/Lib/dos_8x3/formatte.py
index 79be0f64e35b75cddb5126e9fb5a1ac64515b33c..507ed8a6fafae38f4cfd32b5c8016cc2f84e5061 100755 (executable)
--- a/Lib/dos_8x3/formatte.py
+++ b/Lib/dos_8x3/formatte.py
@@ -16,9 +16,8 @@ class NullFormatter:
        self.writer = writer
     def end_paragraph(self, blankline): pass
     def add_line_break(self): pass
-    def add_hor_rule(self, abswidth=None, percentwidth=1.0,
-                    height=None, align=None): pass
-    def add_label_data(self, format, counter): pass
+    def add_hor_rule(self, *args, **kw): pass
+    def add_label_data(self, format, counter, blankline=None): pass
     def add_flowing_data(self, data): pass
     def add_literal_data(self, data): pass
     def flush_softspace(self): pass

diff --git a/Lib/dos_8x3/macurl2p.py b/Lib/dos_8x3/macurl2p.py
index 65afe69c13a9824ed3d87697d1898bda9617baf3..7d53d624aa7296d1e4cddc643ea4c098e80ad185 100755 (executable)
--- a/Lib/dos_8x3/macurl2p.py
+++ b/Lib/dos_8x3/macurl2p.py
@@ -1,4 +1,5 @@
-"""Mac specific module for conversion between pathnames and URLs."""
+"""Mac specific module for conversion between pathnames and URLs.
+Do not import directly, use urllib instead."""
 
 import string
 import urllib