You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
64 lines
1.9 KiB
64 lines
1.9 KiB
Index: Paste-1.7.5/paste/debug/fsdiff.py |
|
=================================================================== |
|
--- Paste-1.7.5.orig/paste/debug/fsdiff.py |
|
+++ Paste-1.7.5/paste/debug/fsdiff.py |
|
@@ -12,7 +12,10 @@ the file was. |
|
import os |
|
from fnmatch import fnmatch |
|
from datetime import datetime |
|
-from paste.util.UserDict24 import IterableUserDict |
|
+try: |
|
+ from UserDict import IterableUserDict |
|
+except ImportError: |
|
+ from paste.util.UserDict24 import IterableUserDict |
|
import operator |
|
import re |
|
|
|
Index: Paste-1.7.5/paste/debug/doctest_webapp.py |
|
=================================================================== |
|
--- Paste-1.7.5.orig/paste/debug/doctest_webapp.py |
|
+++ Paste-1.7.5/paste/debug/doctest_webapp.py |
|
@@ -8,10 +8,7 @@ |
|
These are functions for use when doctest-testing a document. |
|
""" |
|
|
|
-try: |
|
- import subprocess |
|
-except ImportError: |
|
- from paste.util import subprocess24 as subprocess |
|
+import subprocess |
|
import doctest |
|
import os |
|
import sys |
|
Index: Paste-1.7.5/paste/debug/wdg_validate.py |
|
=================================================================== |
|
--- Paste-1.7.5.orig/paste/debug/wdg_validate.py |
|
+++ Paste-1.7.5/paste/debug/wdg_validate.py |
|
@@ -6,10 +6,7 @@ Middleware that tests the validity of al |
|
""" |
|
|
|
from cStringIO import StringIO |
|
-try: |
|
- import subprocess |
|
-except ImportError: |
|
- from paste.util import subprocess24 as subprocess |
|
+import subprocess |
|
from paste.response import header_value |
|
import re |
|
import cgi |
|
Index: Paste-1.7.5/paste/fixture.py |
|
=================================================================== |
|
--- Paste-1.7.5.orig/paste/fixture.py |
|
+++ Paste-1.7.5/paste/fixture.py |
|
@@ -26,10 +26,7 @@ try: |
|
except ImportError: |
|
from StringIO import StringIO |
|
import re |
|
-try: |
|
- import subprocess |
|
-except ImportError: |
|
- from paste.util import subprocess24 as subprocess |
|
+import subprocess |
|
|
|
from paste import wsgilib |
|
from paste import lint
|
|
|