saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix pylint

Browse source
This commit is contained in:
Daniel Wallace 2018-04-30 14:15:53 -05:00
parent 98b5629b36
commit a36e49fd27
No known key found for this signature in database
GPG key ID: 5FA5E5544F010D48
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/daemons/flo/zero.py
View file

@ -20,7 +20,6 @@ import salt.master
import salt.crypt
import salt.daemons.masterapi
import salt.payload
import salt.utils.stringutils
log = logging.getLogger(__name__)

4
salt/utils/zeromq.py
View file

@ -34,7 +34,7 @@ if ZMQDefaultLoop is None:
# Support for ZeroMQ 13.x
if not hasattr(zmq.eventloop.ioloop, 'ZMQIOLoop'):
zmq.eventloop.ioloop.ZMQIOLoop = zmq.eventloop.ioloop.IOLoop
if not tornado.version_info >= (5,):
if tornado.version_info < (5,):
ZMQDefaultLoop = zmq.eventloop.ioloop.ZMQIOLoop
except ImportError:
ZMQDefaultLoop = None
@ -49,7 +49,7 @@ def install_zmq():
:return:
'''
if zmq and ZMQ_VERSION_INFO[0] < 17:
if not tornado.version_info >= (5,):
if tornado.version_info < (5,):
zmq.eventloop.ioloop.install()