Merge Moshe's patch (fix argcnt for _cmp() into the 2.0.1 branch.

diff --git a/Lib/filecmp.py b/Lib/filecmp.py
index e84dd07b669193d4f7b74cac9c494c7d914b0d2b..e5024a493a586e3c271eddeaf770ee7d53ce3b64 100644 (file)
--- a/Lib/filecmp.py
+++ b/Lib/filecmp.py
@@ -295,9 +295,9 @@ def cmpfiles(a, b, common, shallow=1, use_statcache=0):
 #      1 for different
 #      2 for funny cases (can't stat, etc.)
 #
-def _cmp(a, b):
+def _cmp(a, b, sh, st):
     try:
-        return not abs(cmp(a, b))
+        return not abs(cmp(a, b, sh, st))
     except os.error:
         return 2