Commit 35883ebd authored by Tres Seaver's avatar Tres Seaver

Switch to a capability test for broken urlsplit.

parent cb1730b3
from io import BytesIO from io import BytesIO
import os import os
import sys
from ZConfig import loadConfig from ZConfig import loadConfig
from ZConfig import loadSchemaFile from ZConfig import loadSchemaFile
...@@ -17,6 +16,9 @@ from zodburi.datatypes import convert_tuple ...@@ -17,6 +16,9 @@ from zodburi.datatypes import convert_tuple
from zodburi._compat import parse_qsl from zodburi._compat import parse_qsl
from zodburi._compat import urlsplit from zodburi._compat import urlsplit
# Capability test for older Pythons (2.x < 2.7.4, 3.x < 3.2.4)
(scheme, netloc, path, query, frag) = urlsplit('scheme:///path/#frag')
_BROKEN_URLSPLIT = frag != 'frag'
class Resolver(object): class Resolver(object):
_int_args = () _int_args = ()
...@@ -169,7 +171,7 @@ class ZConfigURIResolver(object): ...@@ -169,7 +171,7 @@ class ZConfigURIResolver(object):
def __call__(self, uri): def __call__(self, uri):
(scheme, netloc, path, query, frag) = urlsplit(uri) (scheme, netloc, path, query, frag) = urlsplit(uri)
if sys.version_info[:3] < (2, 7, 4): #pragma NO COVER if _BROKEN_URLSPLIT: #pragma NO COVER
# urlsplit used not to allow fragments in non-standard schemes, # urlsplit used not to allow fragments in non-standard schemes,
# stuffed everything into 'path' # stuffed everything into 'path'
(scheme, netloc, path, query, frag (scheme, netloc, path, query, frag
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment