diff options
| -rw-r--r-- | _pytest/conftest.py | 2 | ||||
| -rw-r--r-- | _pytest/test_eventrouter.py | 3 | ||||
| -rw-r--r-- | wee_slack.py | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/_pytest/conftest.py b/_pytest/conftest.py index 07e3639..2dffd4f 100644 --- a/_pytest/conftest.py +++ b/_pytest/conftest.py @@ -105,7 +105,7 @@ class FakeWeechat: def prnt(*args): output = "(" for arg in args: - if arg != None: + if arg is not None: output += "{}, ".format(arg) print("w.prnt {}".format(output)) diff --git a/_pytest/test_eventrouter.py b/_pytest/test_eventrouter.py index 5420d5a..81317b8 100644 --- a/_pytest/test_eventrouter.py +++ b/_pytest/test_eventrouter.py @@ -1,7 +1,6 @@ from __future__ import print_function, unicode_literals -import pytest -from wee_slack import EventRouter, SlackRequest +from wee_slack import EventRouter def test_EventRouter(mock_weechat): diff --git a/wee_slack.py b/wee_slack.py index c1a3c73..da10960 100644 --- a/wee_slack.py +++ b/wee_slack.py @@ -1684,7 +1684,7 @@ class SlackTeam(object): # only http proxy is currently supported proxy = ProxyWrapper() timeout = config.slack_timeout / 1000 - if proxy.has_proxy == True: + if proxy.has_proxy: ws = create_connection( self.ws_url, timeout=timeout, @@ -3425,7 +3425,7 @@ class SlackMessage(object): self.open_thread() if message.user_identifier != self.team.myidentifier and ( - config.notify_subscribed_threads == True + config.notify_subscribed_threads is True or config.notify_subscribed_threads == "auto" and not config.auto_open_threads and not config.thread_messages_in_channel |