|
 |
a4e9bd |
Index: Paste-1.7.5/paste/debug/fsdiff.py
|
|
|
a4e9bd |
===================================================================
|
|
|
a4e9bd |
--- Paste-1.7.5.orig/paste/debug/fsdiff.py
|
|
|
a4e9bd |
+++ Paste-1.7.5/paste/debug/fsdiff.py
|
|
|
a4e9bd |
@@ -12,7 +12,10 @@ the file was.
|
|
|
a4e9bd |
import os
|
|
|
a4e9bd |
from fnmatch import fnmatch
|
|
|
a4e9bd |
from datetime import datetime
|
|
|
a4e9bd |
-from paste.util.UserDict24 import IterableUserDict
|
|
|
a4e9bd |
+try:
|
|
|
a4e9bd |
+ from UserDict import IterableUserDict
|
|
|
a4e9bd |
+except ImportError:
|
|
|
a4e9bd |
+ from paste.util.UserDict24 import IterableUserDict
|
|
|
a4e9bd |
import operator
|
|
|
a4e9bd |
import re
|
|
|
a4e9bd |
|
|
|
a4e9bd |
Index: Paste-1.7.5/paste/debug/doctest_webapp.py
|
|
|
a4e9bd |
===================================================================
|
|
|
a4e9bd |
--- Paste-1.7.5.orig/paste/debug/doctest_webapp.py
|
|
|
a4e9bd |
+++ Paste-1.7.5/paste/debug/doctest_webapp.py
|
|
|
a4e9bd |
@@ -8,10 +8,7 @@
|
|
|
a4e9bd |
These are functions for use when doctest-testing a document.
|
|
|
a4e9bd |
"""
|
|
|
a4e9bd |
|
|
|
a4e9bd |
-try:
|
|
|
a4e9bd |
- import subprocess
|
|
|
a4e9bd |
-except ImportError:
|
|
|
a4e9bd |
- from paste.util import subprocess24 as subprocess
|
|
|
a4e9bd |
+import subprocess
|
|
|
a4e9bd |
import doctest
|
|
|
a4e9bd |
import os
|
|
|
a4e9bd |
import sys
|
|
|
a4e9bd |
Index: Paste-1.7.5/paste/debug/wdg_validate.py
|
|
|
a4e9bd |
===================================================================
|
|
|
a4e9bd |
--- Paste-1.7.5.orig/paste/debug/wdg_validate.py
|
|
|
a4e9bd |
+++ Paste-1.7.5/paste/debug/wdg_validate.py
|
|
|
a4e9bd |
@@ -6,10 +6,7 @@ Middleware that tests the validity of al
|
|
|
a4e9bd |
"""
|
|
|
a4e9bd |
|
|
|
a4e9bd |
from cStringIO import StringIO
|
|
|
a4e9bd |
-try:
|
|
|
a4e9bd |
- import subprocess
|
|
|
a4e9bd |
-except ImportError:
|
|
|
a4e9bd |
- from paste.util import subprocess24 as subprocess
|
|
|
a4e9bd |
+import subprocess
|
|
|
a4e9bd |
from paste.response import header_value
|
|
|
a4e9bd |
import re
|
|
|
a4e9bd |
import cgi
|
|
|
a4e9bd |
Index: Paste-1.7.5/paste/fixture.py
|
|
|
a4e9bd |
===================================================================
|
|
|
a4e9bd |
--- Paste-1.7.5.orig/paste/fixture.py
|
|
|
a4e9bd |
+++ Paste-1.7.5/paste/fixture.py
|
|
|
a4e9bd |
@@ -26,10 +26,7 @@ try:
|
|
|
a4e9bd |
except ImportError:
|
|
|
a4e9bd |
from StringIO import StringIO
|
|
|
a4e9bd |
import re
|
|
|
a4e9bd |
-try:
|
|
|
a4e9bd |
- import subprocess
|
|
|
a4e9bd |
-except ImportError:
|
|
|
a4e9bd |
- from paste.util import subprocess24 as subprocess
|
|
|
a4e9bd |
+import subprocess
|
|
|
a4e9bd |
|
|
|
a4e9bd |
from paste import wsgilib
|
|
|
a4e9bd |
from paste import lint
|