Remove unnecessary break lines.

Author: Tasuku OKUDA

linebot/api.py

@@ -15,10 +15,8 @@
 class LineBotApi(object):
     DEFAULT_API_ENDPOINT = 'https://api.line.me'
 
-    def __init__(
-            self, channel_access_token, endpoint=DEFAULT_API_ENDPOINT,
-            timeout=HttpClient.DEFAULT_TIMEOUT, http_client=RequestsHttpClient
-    ):
+    def __init__(self, channel_access_token, endpoint=DEFAULT_API_ENDPOINT,
+                 timeout=HttpClient.DEFAULT_TIMEOUT, http_client=RequestsHttpClient):
         """Constructor of LineBotApi Client
 
         Args:
@@ -114,9 +112,7 @@ def get_profile(self, user_id, timeout=None):
         )
         return Profile.new_from_json_dict(json.loads(body))
 
-    def get_content_stream(
-            self, message_id, chunk_size=1024, timeout=None
-    ):
+    def get_content_stream(self, message_id, chunk_size=1024, timeout=None):
         """Call get content API
 
         Retrieve image, video, and audio data sent by users.
@@ -181,9 +177,7 @@ def _get(self, path, timeout=None):
         self.__check_error(response)
         return response.body
 
-    def _get_stream(
-            self, path, chunk_size=1024, decode_unicode=False, timeout=None
-    ):
+    def _get_stream(self, path, chunk_size=1024, decode_unicode=False, timeout=None):
         url = self.endpoint + path
 
         response = self.http_client.get_stream(

linebot/http_client.py

@@ -7,9 +7,7 @@
 class HttpClient(object):
     DEFAULT_TIMEOUT = 5
 
-    def __init__(
-            self, timeout=DEFAULT_TIMEOUT
-    ):
+    def __init__(self, timeout=DEFAULT_TIMEOUT):
         """Constructor of HttpClient
 
         Args:
@@ -61,9 +59,7 @@ def post(self, url, headers=None, data=None, timeout=None):
 
 
 class RequestsHttpClient(HttpClient):
-    def __init__(
-            self, timeout=HttpClient.DEFAULT_TIMEOUT
-    ):
+    def __init__(self, timeout=HttpClient.DEFAULT_TIMEOUT):
         """Constructor of RequestsHttpClient
 
         'requests' implementation.

linebot/models/events.py

@@ -72,9 +72,7 @@ def __init__(
 
 
 class FollowEvent(Event):
-    def __init__(
-            self, timestamp=None, source=None, reply_token=None, **kwargs
-    ):
+    def __init__(self, timestamp=None, source=None, reply_token=None, **kwargs):
         """FollowEvent
 
         https://devdocs.line.me/en/#follow-event
@@ -116,9 +114,7 @@ def __init__(self, timestamp=None, source=None, **kwargs):
 
 
 class JoinEvent(Event):
-    def __init__(
-            self, timestamp=None, source=None, reply_token=None, **kwargs
-    ):
+    def __init__(self, timestamp=None, source=None, reply_token=None, **kwargs):
         """JoinEvent
 
         https://devdocs.line.me/en/#join-event
@@ -160,10 +156,8 @@ def __init__(self, timestamp=None, source=None, **kwargs):
 
 
 class PostbackEvent(Event):
-    def __init__(
-            self, timestamp=None, source=None,
-            reply_token=None, postback=None, **kwargs
-    ):
+    def __init__(self, timestamp=None, source=None,
+                 reply_token=None, postback=None, **kwargs):
         """PostbackEvent
 
         https://devdocs.line.me/en/#postback-event
@@ -190,10 +184,8 @@ def __init__(
 
 
 class BeaconEvent(Event):
-    def __init__(
-            self, timestamp=None, source=None, reply_token=None,
-            beacon=None, **kwargs
-    ):
+    def __init__(self, timestamp=None, source=None, reply_token=None,
+                 beacon=None, **kwargs):
         """BeaconEvent
 
         https://devdocs.line.me/en/#beacon-event

tests/test_webhook.py

@@ -52,16 +52,12 @@ def test_parse(self):
 
         # MessageEvent, SourceUser, TextMessage
         self.assertIsInstance(events[0], MessageEvent)
-        self.assertEqual(
-            events[0].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA'
-        )
+        self.assertEqual(events[0].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA')
         self.assertEqual(events[0].type, 'message')
         self.assertEqual(events[0].timestamp, 1462629479859)
         self.assertIsInstance(events[0].source, SourceUser)
         self.assertEqual(events[0].source.type, 'user')
-        self.assertEqual(
-            events[0].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
+        self.assertEqual(events[0].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
         self.assertEqual(
             events[0].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
         )
@@ -72,102 +68,69 @@ def test_parse(self):
 
         # MessageEvent, SourceRoom, TextMessage
         self.assertIsInstance(events[1], MessageEvent)
-        self.assertEqual(
-            events[1].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA'
-        )
+        self.assertEqual(events[1].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA')
         self.assertEqual(events[1].type, 'message')
         self.assertEqual(events[1].timestamp, 1462629479859)
         self.assertIsInstance(events[1].source, SourceRoom)
         self.assertEqual(events[1].source.type, 'room')
-        self.assertEqual(
-            events[1].source.room_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
-        self.assertEqual(
-            events[1].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
+        self.assertEqual(events[1].source.room_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
+        self.assertEqual(events[1].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
         self.assertIsInstance(events[1].message, ImageMessage)
         self.assertEqual(events[1].message.id, '325708')
         self.assertEqual(events[1].message.type, 'image')
 
         # MessageEvent, SourceUser, VideoMessage
         self.assertIsInstance(events[2], MessageEvent)
-        self.assertEqual(
-            events[2].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA'
-        )
+        self.assertEqual(events[2].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA')
         self.assertEqual(events[2].type, 'message')
         self.assertEqual(events[2].timestamp, 1462629479859)
         self.assertIsInstance(events[2].source, SourceUser)
         self.assertEqual(events[2].source.type, 'user')
-        self.assertEqual(
-            events[2].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
-        self.assertEqual(
-            events[2].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
+        self.assertEqual(events[2].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
+        self.assertEqual(events[2].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
         self.assertIsInstance(events[2].message, VideoMessage)
         self.assertEqual(events[2].message.id, '325708')
         self.assertEqual(events[2].message.type, 'video')
 
         # MessageEvent, SourceUser, AudioMessage
         self.assertIsInstance(events[3], MessageEvent)
-        self.assertEqual(
-            events[3].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA'
-        )
+        self.assertEqual(events[3].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA')
         self.assertEqual(events[3].type, 'message')
         self.assertEqual(events[3].timestamp, 1462629479859)
         self.assertIsInstance(events[3].source, SourceUser)
         self.assertEqual(events[3].source.type, 'user')
-        self.assertEqual(
-            events[3].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
-        self.assertEqual(
-            events[3].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
+        self.assertEqual(events[3].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
+        self.assertEqual(events[3].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
         self.assertIsInstance(events[3].message, AudioMessage)
         self.assertEqual(events[3].message.id, '325708')
         self.assertEqual(events[3].message.type, 'audio')
 
         # MessageEvent, SourceUser, LocationMessage
         self.assertIsInstance(events[4], MessageEvent)
-        self.assertEqual(
-            events[4].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA'
-        )
+        self.assertEqual(events[4].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA')
         self.assertEqual(events[4].type, 'message')
         self.assertEqual(events[4].timestamp, 1462629479859)
         self.assertIsInstance(events[4].source, SourceUser)
         self.assertEqual(events[4].source.type, 'user')
-        self.assertEqual(
-            events[4].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
-        self.assertEqual(
-            events[4].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
+        self.assertEqual(events[4].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
+        self.assertEqual(events[4].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
         self.assertIsInstance(events[4].message, LocationMessage)
         self.assertEqual(events[4].message.id, '325708')
         self.assertEqual(events[4].message.type, 'location')
         self.assertEqual(events[4].message.title, 'my location')
-        self.assertEqual(
-            events[4].message.address,
-            'Tokyo'
-        )
+        self.assertEqual(events[4].message.address, 'Tokyo')
         self.assertEqual(events[4].message.latitude, 35.65910807942215)
         self.assertEqual(events[4].message.longitude, 139.70372892916203)
 
         # MessageEvent, SourceUser, StickerMessage
         self.assertIsInstance(events[5], MessageEvent)
-        self.assertEqual(
-            events[5].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA'
-        )
+        self.assertEqual(events[5].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA')
         self.assertEqual(events[5].type, 'message')
         self.assertEqual(events[5].timestamp, 1462629479859)
         self.assertIsInstance(events[5].source, SourceUser)
         self.assertEqual(events[5].source.type, 'user')
-        self.assertEqual(
-            events[5].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
-        self.assertEqual(
-            events[5].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
+        self.assertEqual(events[5].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
+        self.assertEqual(events[5].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
         self.assertIsInstance(events[5].message, StickerMessage)
         self.assertEqual(events[5].message.id, '325708')
         self.assertEqual(events[5].message.type, 'sticker')
@@ -176,97 +139,62 @@ def test_parse(self):
 
         # FollowEvent, SourceUser
         self.assertIsInstance(events[6], FollowEvent)
-        self.assertEqual(
-            events[6].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA'
-        )
+        self.assertEqual(events[6].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA')
         self.assertEqual(events[6].type, 'follow')
         self.assertEqual(events[6].timestamp, 1462629479859)
         self.assertIsInstance(events[6].source, SourceUser)
         self.assertEqual(events[6].source.type, 'user')
-        self.assertEqual(
-            events[6].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
-        self.assertEqual(
-            events[6].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
+        self.assertEqual(events[6].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
+        self.assertEqual(events[6].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
 
         # UnfollowEvent, SourceUser
         self.assertIsInstance(events[7], UnfollowEvent)
         self.assertEqual(events[7].type, 'unfollow')
         self.assertEqual(events[7].timestamp, 1462629479859)
         self.assertIsInstance(events[7].source, SourceUser)
         self.assertEqual(events[7].source.type, 'user')
-        self.assertEqual(
-            events[7].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
-        self.assertEqual(
-            events[7].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
+        self.assertEqual(events[7].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
+        self.assertEqual(events[7].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
 
         # JoinEvent, SourceGroup
         self.assertIsInstance(events[8], JoinEvent)
-        self.assertEqual(
-            events[8].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA'
-        )
+        self.assertEqual(events[8].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA')
         self.assertEqual(events[8].type, 'join')
         self.assertEqual(events[8].timestamp, 1462629479859)
         self.assertIsInstance(events[8].source, SourceGroup)
         self.assertEqual(events[8].source.type, 'group')
-        self.assertEqual(
-            events[8].source.group_id, 'cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-        )
-        self.assertEqual(
-            events[8].source.sender_id, 'cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-        )
+        self.assertEqual(events[8].source.group_id, 'cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
+        self.assertEqual(events[8].source.sender_id, 'cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
 
         # LeaveEvent, SourceGroup
         self.assertIsInstance(events[9], LeaveEvent)
         self.assertEqual(events[9].type, 'leave')
         self.assertEqual(events[9].timestamp, 1462629479859)
         self.assertIsInstance(events[9].source, SourceGroup)
         self.assertEqual(events[9].source.type, 'group')
-        self.assertEqual(
-            events[9].source.group_id, 'cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-        )
-        self.assertEqual(
-            events[9].source.sender_id, 'cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-        )
+        self.assertEqual(events[9].source.group_id, 'cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
+        self.assertEqual(events[9].source.sender_id, 'cxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')
 
         # PostbackEvent, SourceUser
         self.assertIsInstance(events[10], PostbackEvent)
-        self.assertEqual(
-            events[10].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA'
-        )
+        self.assertEqual(events[10].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA')
         self.assertEqual(events[10].type, 'postback')
         self.assertEqual(events[10].timestamp, 1462629479859)
         self.assertIsInstance(events[10].source, SourceUser)
         self.assertEqual(events[10].source.type, 'user')
-        self.assertEqual(
-            events[10].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
-        self.assertEqual(
-            events[10].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
-        self.assertEqual(
-            events[10].postback.data,
-            'action=buyItem&itemId=123123&color=red'
-        )
+        self.assertEqual(events[10].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
+        self.assertEqual(events[10].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
+        self.assertEqual(events[10].postback.data, 'action=buyItem&itemId=123123&color=red')
 
         # BeaconEvent, SourceUser
         self.assertIsInstance(events[11], BeaconEvent)
-        self.assertEqual(
-            events[11].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA'
-        )
+        self.assertEqual(events[11].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA')
         self.assertEqual(events[11].type, 'beacon')
         self.assertEqual(events[11].timestamp, 1462629479859)
         self.assertIsInstance(events[11].source, SourceUser)
         self.assertEqual(events[11].source.type, 'user')
-        self.assertEqual(
-            events[11].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
-        self.assertEqual(
-            events[11].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8'
-        )
+        self.assertEqual(events[11].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
+        self.assertEqual(events[11].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
         self.assertEqual(events[11].beacon.hwid, 'd41d8cd98f')
         self.assertEqual(events[11].beacon.type, 'enter')