Properly warn if the user is using python2

pull/30/head
Raphaël Vinot 2016-10-25 11:36:49 -04:00
parent 5ccb4db3d3
commit 2c2bfe2354
1 changed files with 2 additions and 2 deletions

View File

@ -11,10 +11,10 @@ import re
import warnings
try:
warnings.warn("You're using python 2, it is strongly recommended to use python >=3.3")
from urllib.parse import urljoin
except ImportError:
from urlparse import urljoin
warnings.warn("You're using python 2, it is strongly recommended to use python >=3.3")
from io import BytesIO
import zipfile
@ -31,8 +31,8 @@ from .mispevent import MISPEvent, MISPAttribute, EncodeUpdate
# Least dirty way to support python 2 and 3
try:
warnings.warn("You're using python 2, it is strongly recommended to use python >=3.3")
basestring
warnings.warn("You're using python 2, it is strongly recommended to use python >=3.3")
except NameError:
basestring = str