diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2015-08-10 18:29:33 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2015-09-01 11:42:01 +0200 |
| commit | dd16cc98b0d67f1448bf9de25f8adce512b1431c (patch) | |
| tree | e9fa6c41da6894b16a366b02d61c29b15c5a9b4a /ipapython/cookie.py | |
| parent | 404177f7a322ced4e05cfc6b2ed330b6fcce0c04 (diff) | |
| download | freeipa-dd16cc98b0d67f1448bf9de25f8adce512b1431c.tar.gz freeipa-dd16cc98b0d67f1448bf9de25f8adce512b1431c.tar.xz freeipa-dd16cc98b0d67f1448bf9de25f8adce512b1431c.zip | |
Use six.string_types instead of "basestring"
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipapython/cookie.py')
| -rw-r--r-- | ipapython/cookie.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ipapython/cookie.py b/ipapython/cookie.py index c12e0a127..8b91457d9 100644 --- a/ipapython/cookie.py +++ b/ipapython/cookie.py @@ -23,6 +23,9 @@ import datetime import email.utils from urllib2 import urlparse from calendar import timegm + +import six + from ipapython.ipa_log_manager import log_mgr ''' @@ -390,7 +393,7 @@ class Cookie(object): self._timestamp = value elif isinstance(value, (int, long, float)): self._timestamp = datetime.datetime.utcfromtimestamp(value) - elif isinstance(value, basestring): + elif isinstance(value, six.string_types): self._timestamp = Cookie.parse_datetime(value) else: raise TypeError('value must be datetime, int, long, float, basestring or None, not %s' % \ @@ -416,7 +419,7 @@ class Cookie(object): self._expires = value elif isinstance(value, (int, long, float)): self._expires = datetime.datetime.utcfromtimestamp(value) - elif isinstance(value, basestring): + elif isinstance(value, six.string_types): self._expires = Cookie.parse_datetime(value) else: raise TypeError('value must be datetime, int, long, float, basestring or None, not %s' % \ |