openstack/deb-python-pyldap
Code Issues Proposed changes

[Py3] Import the renamed urlparse module from the proper location

Browse Source
This commit is contained in:
Petr Viktorin
2015-09-14 15:59:23 +02:00
parent 8394a017ea
commit 955da433a7
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/ldif.py
View File

@@ -23,12 +23,17 @@ __all__ = [
'LDIFCopy', 'LDIFCopy',
] ]
import urlparse,urllib,base64,re,types import urllib
import base64
import re
import types
try: try:
from cStringIO import StringIO from cStringIO import StringIO
import urlparse import urlparse
except ImportError: except ImportError:
from StringIO import StringIO from StringIO import StringIO
import urllib.parse import urlparse
attrtype_pattern = r'[\w;.-]+(;[\w_-]+)*' attrtype_pattern = r'[\w;.-]+(;[\w_-]+)*'
attrvalue_pattern = r'(([^,]|\\,)+|".*?")' attrvalue_pattern = r'(([^,]|\\,)+|".*?")'
@@ -333,7 +338,7 @@ class LDIFParser:
url = unfolded_line[colon_pos+2:].strip() url = unfolded_line[colon_pos+2:].strip()
attr_value = None attr_value = None
if self._process_url_schemes: if self._process_url_schemes:
u = urlparse.urlparse(url) u = urlparse(url)
if u[0] in self._process_url_schemes: if u[0] in self._process_url_schemes:
attr_value = urllib.urlopen(url).read() attr_value = urllib.urlopen(url).read()
elif value_spec==':\r\n' or value_spec=='\n': elif value_spec==':\r\n' or value_spec=='\n':