Merged in mfrobben/paste (pull request #21)

Fix bad reference to iterator variable

1 files changed, 3 insertions, 14 deletions

diff --git a/paste/debug/fsdiff.py b/paste/debug/fsdiff.py
index 156a2e4..6f9ec2d 100644
--- a/paste/debug/fsdiff.py
+++ b/paste/debug/fsdiff.py
@@ -17,12 +17,8 @@ try:
     # Python 3
     import collections.UserDict as IterableUserDict
 except ImportError:
-    try:
-        # Python 2.5-2.7
-        from UserDict import IterableUserDict
-    except ImportError:
-        # Python <= 2.4
-        from paste.util.UserDict24 import IterableUserDict
+    # Python 2.5-2.7
+    from UserDict import IterableUserDict
 import operator
 import re
 
@@ -131,13 +127,6 @@ class Snapshot(IterableUserDict):
                 return True
         return False
 
-    def _ignore_file(self, fn):
-        if fn in self.ignore_paths:
-            return True
-        if self.ignore_hidden and os.path.basename(fn).startswith('.'):
-            return True
-        return False
-
     def _find_traverse(self, path, result):
         full = os.path.join(self.base_path, path)
         if os.path.isdir(full):
@@ -298,7 +287,7 @@ class Dir(File):
             "Directory %r doesn't have content" % self)
 
     bytes = property(bytes__get)
-    
+
 
 def _space_prefix(pref, full, sep=None, indent=None, include_sep=True):
     """