MISP
/
PyMISP
mirror of https://github.com/MISP/PyMISP
2
0
Fork 0
Code Issues Releases Wiki Activity

Make PEP8 happy

pull/9/head
Raphaël Vinot 2016-04-04 18:34:08 +02:00
parent 1b7877dd06
commit cb09a19e24
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pymisp/api.py
View File

@ -11,9 +11,7 @@ import re
try: try:
from urllib.parse import urljoin from urllib.parse import urljoin
from urllib.parse import quote
except ImportError: except ImportError:
from urllib import quote
from urlparse import urljoin from urlparse import urljoin
from io import BytesIO from io import BytesIO
import zipfile import zipfile
@ -48,9 +46,11 @@ class NewEventError(PyMISPError):
class NewAttributeError(PyMISPError): class NewAttributeError(PyMISPError):
pass pass
class SearchError(PyMISPError): class SearchError(PyMISPError):
pass pass
class MissingDependency(PyMISPError): class MissingDependency(PyMISPError):
pass pass
@ -174,7 +174,7 @@ class PyMISP(object):
raise PyMISPError('Unknown error: {}'.format(response.text)) raise PyMISPError('Unknown error: {}'.format(response.text))
errors = [] errors = []
if type(to_return) is list: if isinstance(to_return, list):
to_return = {'response': to_return} to_return = {'response': to_return}
if to_return.get('error'): if to_return.get('error'):
if not isinstance(to_return['error'], list): if not isinstance(to_return['error'], list):
@ -734,8 +734,8 @@ class PyMISP(object):
buildup_url = "events/index" buildup_url = "events/index"
for rule in allowed.keys(): for rule in allowed.keys():
if allowed[rule] != None: if allowed[rule] is not None:
if type(allowed[rule])!=list: if not isinstance(allowed[rule], list):
allowed[rule] = [allowed[rule]] allowed[rule] = [allowed[rule]]
allowed[rule] = map(str, allowed[rule]) allowed[rule] = map(str, allowed[rule])
if rule in rule_levels: if rule in rule_levels: