summaryrefslogtreecommitdiffstats
path: root/ipapython/cookie.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2015-09-14 12:52:29 +0200
committerJan Cholasta <jcholast@redhat.com>2015-10-07 10:27:20 +0200
commit70b37a956c0b7dad52bf14fdb5fed421c01c8f77 (patch)
tree76768609fdbca12ccc93b092e14c4fc4ae06459a /ipapython/cookie.py
parent7f1204a42c0fd13602768e24da7af8814cbf97d2 (diff)
downloadfreeipa-70b37a956c0b7dad52bf14fdb5fed421c01c8f77.tar.gz
freeipa-70b37a956c0b7dad52bf14fdb5fed421c01c8f77.tar.xz
freeipa-70b37a956c0b7dad52bf14fdb5fed421c01c8f77.zip
Use six.moves.urllib instead of urllib/urllib2/urlparse
In Python 3, these modules are reorganized. Reviewed-By: David Kupka <dkupka@redhat.com> Reviewed-By: Jan Cholasta <jcholast@redhat.com> Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipapython/cookie.py')
-rw-r--r--ipapython/cookie.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipapython/cookie.py b/ipapython/cookie.py
index ee54efd7b..84de94c9c 100644
--- a/ipapython/cookie.py
+++ b/ipapython/cookie.py
@@ -21,10 +21,10 @@ import re
import time
import datetime
import email.utils
-from urllib2 import urlparse
from calendar import timegm
import six
+from six.moves.urllib.parse import urlparse
from ipapython.ipa_log_manager import log_mgr
@@ -540,7 +540,7 @@ class Cookie(object):
received from.
'''
- scheme, domain, path, params, query, fragment = urlparse.urlparse(url)
+ scheme, domain, path, params, query, fragment = urlparse(url)
if self.domain is None:
self.domain = domain.lower()
@@ -642,7 +642,7 @@ class Cookie(object):
cookie_name = self.key
- url_scheme, url_domain, url_path, url_params, url_query, url_fragment = urlparse.urlparse(url)
+ url_scheme, url_domain, url_path, url_params, url_query, url_fragment = urlparse(url)
cookie_expiration = self.get_expiration()
if cookie_expiration is not None: