Python 3: use new names of standard library modules

Use "try/except ImportError" to try Python 2 and Python 3 names.

1 files changed, 11 insertions, 1 deletions

diff --git a/paste/debug/fsdiff.py b/paste/debug/fsdiff.py
index 2849ea8..f680bf6 100644
--- a/paste/debug/fsdiff.py
+++ b/paste/debug/fsdiff.py
@@ -12,7 +12,17 @@ the file was.
 import os
 from fnmatch import fnmatch
 from datetime import datetime
-from paste.util.UserDict24 import IterableUserDict
+
+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
 import operator
 import re