summaryrefslogtreecommitdiff
path: root/paste/urlparser.py
diff options
context:
space:
mode:
authorcce <devnull@localhost>2006-09-21 05:46:57 +0000
committercce <devnull@localhost>2006-09-21 05:46:57 +0000
commit3559f127031598b0dcc2a243454d2c15309a109b (patch)
treeadbc46bdde0022b8d751d173dfb0065c7319dcaa /paste/urlparser.py
parent9e4f83947cdb42dffdff973d0b9b12a2f775e3b1 (diff)
downloadpaste-3559f127031598b0dcc2a243454d2c15309a109b.tar.gz
Paste should not depend upon other paste modules, such
as Deploy. This patch moves 'converters' into paste.util since it was being used within paste proper. I'll leave it to those who know Deploy to update that. - copied converters.py from paste.deploy to paste.util - updated files that use paste.deploy.converters
Diffstat (limited to 'paste/urlparser.py')
-rw-r--r--paste/urlparser.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/paste/urlparser.py b/paste/urlparser.py
index 2ca824c..367fa02 100644
--- a/paste/urlparser.py
+++ b/paste/urlparser.py
@@ -15,6 +15,7 @@ import fileapp
from paste.util import import_string
import httpexceptions
from httpheaders import ETAG
+from paste.util import converters
class NoDefault:
pass
@@ -107,7 +108,6 @@ class URLParser(object):
self.base_python_name = base_python_name
# This logic here should be deprecated since it is in
# make_url_parser
- from paste.deploy import converters
if index_names is NoDefault:
index_names = global_conf.get(
'index_names', ('index', 'Index', 'main', 'Main'))
@@ -612,7 +612,6 @@ def make_url_parser(global_conf, directory, base_python_name,
``'.pyc'``) and ``ignore_extensions`` are viewable but only if an
explicit extension is given.
"""
- from paste.deploy import converters
if index_names is None:
index_names = global_conf.get(
'index_names', ('index', 'Index', 'main', 'Main'))