Merge pull request #269 from eumiro/none_identity

Refactor: use is for None/True/False

mastodon/streaming.py

@@ -213,11 +213,11 @@ def __init__(self, update_handler=None, local_update_handler=None, delete_handle
         self.status_update_handler = status_update_handler
 
     def on_update(self, status):
-        if self.update_handler != None:
+        if self.update_handler is not None:
             self.update_handler(status)
 
         try:
-            if self.local_update_handler != None and not "@" in status["account"]["acct"]:
+            if self.local_update_handler is not None and not "@" in status["account"]["acct"]:
                 self.local_update_handler(status)
         except Exception as err:
             six.raise_from(
@@ -226,21 +226,21 @@ def on_update(self, status):
             )
 
     def on_delete(self, deleted_id):
-        if self.delete_handler != None:
+        if self.delete_handler is not None:
             self.delete_handler(deleted_id)
 
     def on_notification(self, notification):
-        if self.notification_handler != None:
+        if self.notification_handler is not None:
             self.notification_handler(notification)
 
     def on_conversation(self, conversation):
-        if self.conversation_handler != None:
+        if self.conversation_handler is not None:
             self.conversation_handler(conversation)
 
     def on_unknown_event(self, name, unknown_event=None):
-        if self.unknown_event_handler != None:
+        if self.unknown_event_handler is not None:
             self.unknown_event_handler(name, unknown_event)
 
     def on_status_update(self, status):
-        if self.status_update_handler != None:
+        if self.status_update_handler is not None:
             self.status_update_handler(status)

tests/test_account.py

@@ -252,7 +252,7 @@ def test_featured_tags(api):
         assert featured_tag_list[0].name == "coolfree"
         assert "url" in featured_tag_list[0]
     finally:
-        if not featured_tag is None:
+        if featured_tag is not None:
             api.featured_tag_delete(featured_tag)
         api.featured_tag_delete(featured_tag_2) 
 

tests/test_bookmarks.py

@@ -4,7 +4,7 @@
 def test_bookmarks(api, status):
     status_bookmarked = api.status_bookmark(status)
     assert status_bookmarked
-    assert status_bookmarked.bookmarked == True
+    assert status_bookmarked.bookmarked
 
     bookmarked_statuses = api.bookmarks()
     assert bookmarked_statuses
@@ -18,9 +18,9 @@ def test_bookmarks(api, status):
 
     status_unbookmarked = api.status_unbookmark(status_bookmarked)
     assert status_unbookmarked
-    assert status_unbookmarked.bookmarked == False
+    assert not status_unbookmarked.bookmarked
 
     bookmarked_statuses_2 = api.bookmarks()
-    assert not bookmarked_statuses_2 is None
+    assert bookmarked_statuses_2 is not None
     assert len(bookmarked_statuses_2) == len(bookmarked_statuses) - 1
 

tests/test_constructor.py

@@ -33,9 +33,9 @@ def test_constructor_missing_client_secret():
 
 @pytest.mark.vcr()
 def test_verify_version(api):
-    assert api.verify_minimum_version("2.3.3") == True
-    assert api.verify_minimum_version("9999.9999.9999") == False
-    assert api.verify_minimum_version("1.0.0") == True
+    assert api.verify_minimum_version("2.3.3") is True
+    assert api.verify_minimum_version("9999.9999.9999") is False
+    assert api.verify_minimum_version("1.0.0") is True
 
 def test_supported_version(api):
     assert Mastodon.get_supported_version()

tests/test_filters.py

@@ -7,12 +7,12 @@ def test_filter_create(api):
     with vcr.use_cassette('test_filter_create.yaml', cassette_library_dir='tests/cassettes_pre_4_0_0', record_mode='none'):
         keyword_filter = api.filter_create("anime", ['notifications'], irreversible = False, whole_word = True, expires_in = None)
         try:
-            assert(keyword_filter)
+            assert keyword_filter
 
             all_filters = api.filters()
-            assert(keyword_filter in all_filters)
-            assert(keyword_filter.irreversible == False)
-            assert(keyword_filter.whole_word == True)
+            assert keyword_filter in all_filters
+            assert keyword_filter.irreversible is False
+            assert keyword_filter.whole_word is True
 
             keyword_filter_2 = api.filter(keyword_filter.id)
             assert(keyword_filter == keyword_filter_2)
@@ -22,9 +22,9 @@ def test_filter_create(api):
 
         keyword_filter = api.filter_create("anime", ['notifications'], irreversible = False, whole_word = False, expires_in = None)
         try:
-            assert(keyword_filter)
-            assert(keyword_filter.irreversible == False)
-            assert(keyword_filter.whole_word == False)
+            assert keyword_filter
+            assert keyword_filter.irreversible is False
+            assert keyword_filter.whole_word is False
 
             all_filters = api.filters()
             assert(keyword_filter in all_filters)

tests/test_hooks.py

@@ -32,7 +32,7 @@ def test_date_hook(status):
 
 @pytest.mark.vcr()
 def test_attribute_access(status):
-    assert status.id != None
+    assert status.id is not None
     with pytest.raises(AttributeError):
         status.id = 420
 

tests/test_instance.py

@@ -38,7 +38,7 @@ def test_emoji(api):
 
 @pytest.mark.vcr()
 def test_health(api):
-    assert api.instance_health() == True
+    assert api.instance_health() is True
 
 @pytest.mark.vcr()
 def test_server_time(api):

tests/test_media.py

@@ -21,7 +21,7 @@ def test_media_post_v1(api):
         assert status
 
         try:
-            assert status['sensitive'] == False
+            assert status['sensitive'] is False
             assert status['media_attachments']
             assert status['media_attachments'][0]['description'] == "John Lennon doing a funny walk"
             assert status['media_attachments'][0]['meta']['focus']['x'] == -0.5
@@ -45,7 +45,7 @@ def test_media_post(api, sensitive):
     time.sleep(10)
     media2 = api.media(media)
     assert media2.id == media.id
-    assert not media2.url is None
+    assert media2.url is not None
 
     status = api.status_post(
         'LOL check this out',

tests/test_notifications.py

@@ -29,7 +29,7 @@ def test_notifications_dismiss_pre_2_9_2(api, api2):
             api.verify_minimum_version("2.9.2", cached=False)
             api.notifications_dismiss(notifications[0])
         finally:
-            if not status is None:
+            if status is not None:
                 api2.status_delete(status)            
 
 @pytest.mark.vcr()

tests/test_push.py

@@ -57,14 +57,14 @@ def test_push_update(api):
     print(sub3)
     print(api.push_subscription())
 
-    assert sub3.alerts.follow == False
-    assert sub3.alerts.favourite == False
-    assert sub3.alerts.reblog == False
-    assert sub3.alerts.mention == False
-    assert sub2.alerts.follow == True
-    assert sub2.alerts.favourite == True
-    assert sub2.alerts.reblog == True
-    assert sub2.alerts.mention == True
+    assert sub3.alerts.follow is False
+    assert sub3.alerts.favourite is False
+    assert sub3.alerts.reblog is False
+    assert sub3.alerts.mention is False
+    assert sub2.alerts.follow is True
+    assert sub2.alerts.favourite is True
+    assert sub2.alerts.reblog is True
+    assert sub2.alerts.mention is True
 
 
 @pytest.mark.vcr(match_on=['path'])

tests/test_streaming.py

@@ -20,7 +20,7 @@
 def patch_streaming():
     global streaming_is_patched
     global close_connections
-    if streaming_is_patched == True:
+    if streaming_is_patched is True:
         return
     streaming_is_patched = True
 
@@ -35,7 +35,7 @@ def fakeRealConnectionGetresponse(*args, **kwargs):
                 response = real_connection_real_get_response(*args, **kwargs)
                 real_body = b""
                 try:
-                    while close_connections == False:
+                    while close_connections is False:
                         if len(select.select([response], [], [], 0.01)[0]) > 0:
                             chunk = response.read(1)
                             real_body += chunk
@@ -165,7 +165,7 @@ def test_unknown_event():
         'data: {}',
         '',
     ])
-    assert listener.bla_called == True
+    assert listener.bla_called is True
     assert listener.updates == []
     assert listener.notifications == []
     assert listener.deletes == []
@@ -195,7 +195,7 @@ def test_dotted_unknown_event():
         'data: {}',
         '',
     ])
-    assert listener.do_something_called == True
+    assert listener.do_something_called is True
     assert listener.updates == []
     assert listener.notifications == []
     assert listener.deletes == []

tests/test_timeline.py

@@ -60,8 +60,8 @@ def test_conversations(api, api2):
     assert conversations
     assert status.id in map(lambda x: x.last_status.id, conversations)
     assert account.id in map(lambda x: x.accounts[0].id, conversations)
-    assert conversations[0].unread == True
-    assert conversations2[0].unread == False
+    assert conversations[0].unread is True
+    assert conversations2[0].unread is False
 
 @pytest.mark.vcr()
 def test_min_max_id(api, status):