From 04ecd5542849191457ccfc3e42a39452db47825a Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 21 Apr 2015 15:26:47 +0200 Subject: Strip trailing spaces --- paste/debug/fsdiff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'paste/debug/fsdiff.py') diff --git a/paste/debug/fsdiff.py b/paste/debug/fsdiff.py index 156a2e4..b91eb49 100644 --- a/paste/debug/fsdiff.py +++ b/paste/debug/fsdiff.py @@ -298,7 +298,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): """ -- cgit v1.2.1 From dc4f02614e463c37c8df1bbc93de6b61b2cd1649 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 22 Apr 2015 00:38:47 +0200 Subject: Remove UserDict24 --- paste/debug/fsdiff.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'paste/debug/fsdiff.py') diff --git a/paste/debug/fsdiff.py b/paste/debug/fsdiff.py index b91eb49..136b869 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 -- cgit v1.2.1 From e10fe866549e5ebb774b12912c40974255522dfa Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 22 Apr 2015 02:15:08 +0200 Subject: Fix paste.debug.fsdiff.Snapshot._ignore_file() Remove a duplicated method, keep the implementation using ignore_wildcards. --- paste/debug/fsdiff.py | 7 ------- 1 file changed, 7 deletions(-) (limited to 'paste/debug/fsdiff.py') diff --git a/paste/debug/fsdiff.py b/paste/debug/fsdiff.py index 136b869..6f9ec2d 100644 --- a/paste/debug/fsdiff.py +++ b/paste/debug/fsdiff.py @@ -127,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): -- cgit v1.2.1