trivial fix. (#57)

Author: be-hase

linebot/api.py

@@ -38,7 +38,7 @@ def __init__(self, channel_access_token, endpoint=DEFAULT_API_ENDPOINT,
         :param str endpoint: (optional) Default is https://api.line.me
         :param timeout: (optional) How long to wait for the server
             to send data before giving up, as a float,
-            or a (connect timeout, readtimeout) float tuple.
+            or a (connect timeout, read timeout) float tuple.
             Default is linebot.http_client.HttpClient.DEFAULT_TIMEOUT
         :type timeout: float | tuple(float, float)
         :param http_client: (optional) Default is
@@ -78,7 +78,7 @@ def reply_message(self, reply_token, messages, timeout=None):
             list[T <= :py:class:`linebot.models.send_messages.SendMessage`]
         :param timeout: (optional) How long to wait for the server
             to send data before giving up, as a float,
-            or a (connect timeout, readtimeout) float tuple.
+            or a (connect timeout, read timeout) float tuple.
             Default is self.http_client.timeout
         :type timeout: float | tuple(float, float)
         """
@@ -108,7 +108,7 @@ def push_message(self, to, messages, timeout=None):
             list[T <= :py:class:`linebot.models.send_messages.SendMessage`]
         :param timeout: (optional) How long to wait for the server
             to send data before giving up, as a float,
-            or a (connect timeout, readtimeout) float tuple.
+            or a (connect timeout, read timeout) float tuple.
             Default is self.http_client.timeout
         :type timeout: float | tuple(float, float)
         """
@@ -140,7 +140,7 @@ def multicast(self, to, messages, timeout=None):
             list[T <= :py:class:`linebot.models.send_messages.SendMessage`]
         :param timeout: (optional) How long to wait for the server
             to send data before giving up, as a float,
-            or a (connect timeout, readtimeout) float tuple.
+            or a (connect timeout, read timeout) float tuple.
             Default is self.http_client.timeout
         :type timeout: float | tuple(float, float)
         """
@@ -166,7 +166,7 @@ def get_profile(self, user_id, timeout=None):
         :param str user_id: User ID
         :param timeout: (optional) How long to wait for the server
             to send data before giving up, as a float,
-            or a (connect timeout, readtimeout) float tuple.
+            or a (connect timeout, read timeout) float tuple.
             Default is self.http_client.timeout
         :type timeout: float | tuple(float, float)
         :rtype: :py:class:`linebot.models.responses.Profile`
@@ -188,21 +188,18 @@ def get_group_member_profile(self, group_id, user_id, timeout=None):
         the bot is in. This can be the user ID of a user who has
         not added the bot as a friend or has blocked the bot.
 
-        :param str user_id: User ID
         :param str group_id: Group ID
+        :param str user_id: User ID
         :param timeout: (optional) How long to wait for the server
             to send data before giving up, as a float,
-            or a (connect timeout, readtimeout) float tuple.
+            or a (connect timeout, read timeout) float tuple.
             Default is self.http_client.timeout
         :type timeout: float | tuple(float, float)
         :rtype: :py:class:`linebot.models.responses.Profile`
         :return: Profile instance
         """
         response = self._get(
-            '/v2/bot/group/{group_id}/member/{user_id}'.format(
-                user_id=user_id,
-                group_id=group_id
-            ),
+            '/v2/bot/group/{group_id}/member/{user_id}'.format(group_id=group_id, user_id=user_id),
             timeout=timeout
         )
 
@@ -217,21 +214,18 @@ def get_room_member_profile(self, room_id, user_id, timeout=None):
         the bot is in. This can be the user ID of a user who has
         not added the bot as a friend or has blocked the bot.
 
-        :param str user_id: User ID
         :param str room_id: Room ID
+        :param str user_id: User ID
         :param timeout: (optional) How long to wait for the server
             to send data before giving up, as a float,
-            or a (connect timeout, readtimeout) float tuple.
+            or a (connect timeout, read timeout) float tuple.
             Default is self.http_client.timeout
         :type timeout: float | tuple(float, float)
         :rtype: :py:class:`linebot.models.responses.Profile`
         :return: Profile instance
         """
         response = self._get(
-            '/v2/bot/room/{room_id}/member/{user_id}'.format(
-                user_id=user_id,
-                room_id=room_id
-            ),
+            '/v2/bot/room/{room_id}/member/{user_id}'.format(room_id=room_id, user_id=user_id),
             timeout=timeout
         )
 
@@ -247,7 +241,7 @@ def get_message_content(self, message_id, timeout=None):
         :param str message_id: Message ID
         :param timeout: (optional) How long to wait for the server
             to send data before giving up, as a float,
-            or a (connect timeout, readtimeout) float tuple.
+            or a (connect timeout, read timeout) float tuple.
             Default is self.http_client.timeout
         :type timeout: float | tuple(float, float)
         :rtype: :py:class:`linebot.models.responses.MessageContent`
@@ -270,7 +264,7 @@ def leave_group(self, group_id, timeout=None):
         :param str group_id: Group ID
         :param timeout: (optional) How long to wait for the server
             to send data before giving up, as a float,
-            or a (connect timeout, readtimeout) float tuple.
+            or a (connect timeout, read timeout) float tuple.
             Default is self.http_client.timeout
         :type timeout: float | tuple(float, float)
         """
@@ -289,7 +283,7 @@ def leave_room(self, room_id, timeout=None):
         :param str room_id: Room ID
         :param timeout: (optional) How long to wait for the server
             to send data before giving up, as a float,
-            or a (connect timeout, readtimeout) float tuple.
+            or a (connect timeout, read timeout) float tuple.
             Default is self.http_client.timeout
         :type timeout: float | tuple(float, float)
         """

tests/api/test_get_group_member_profile.py

@@ -17,6 +17,7 @@
 import unittest
 
 import responses
+
 from linebot import (
     LineBotApi
 )
@@ -27,11 +28,10 @@ def setUp(self):
         self.tested = LineBotApi('channel_secret')
 
     @responses.activate
-    def test_get_profile(self):
+    def test_get_group_member_profile(self):
         responses.add(
             responses.GET,
-            LineBotApi.DEFAULT_API_ENDPOINT + '/v2/bot/group/group_id/' +
-            'member/user_id',
+            LineBotApi.DEFAULT_API_ENDPOINT + '/v2/bot/group/group_id/member/user_id',
             json={
                 "displayName": "LINE taro",
                 "userId": "Uxxxxxxxxxxxxxx...",
@@ -46,8 +46,7 @@ def test_get_profile(self):
         self.assertEqual(request.method, 'GET')
         self.assertEqual(
             request.url,
-            LineBotApi.DEFAULT_API_ENDPOINT + '/v2/bot/group/group_id/' +
-            'member/user_id')
+            LineBotApi.DEFAULT_API_ENDPOINT + '/v2/bot/group/group_id/member/user_id')
         self.assertEqual(profile.display_name, 'LINE taro')
         self.assertEqual(profile.user_id, 'Uxxxxxxxxxxxxxx...')
         self.assertEqual(profile.picture_url, 'http://obs.line-apps.com/...')

tests/api/test_get_room_member_profile.py

@@ -17,6 +17,7 @@
 import unittest
 
 import responses
+
 from linebot import (
     LineBotApi
 )
@@ -27,11 +28,10 @@ def setUp(self):
         self.tested = LineBotApi('channel_secret')
 
     @responses.activate
-    def test_get_profile(self):
+    def test_get_room_member_profile(self):
         responses.add(
             responses.GET,
-            LineBotApi.DEFAULT_API_ENDPOINT + '/v2/bot/room/room_id/' +
-            'member/user_id',
+            LineBotApi.DEFAULT_API_ENDPOINT + '/v2/bot/room/room_id/member/user_id',
             json={
                 "displayName": "LINE taro",
                 "userId": "Uxxxxxxxxxxxxxx...",
@@ -46,8 +46,7 @@ def test_get_profile(self):
         self.assertEqual(request.method, 'GET')
         self.assertEqual(
             request.url,
-            LineBotApi.DEFAULT_API_ENDPOINT + '/v2/bot/room/room_id/' +
-            'member/user_id')
+            LineBotApi.DEFAULT_API_ENDPOINT + '/v2/bot/room/room_id/member/user_id')
         self.assertEqual(profile.display_name, 'LINE taro')
         self.assertEqual(profile.user_id, 'Uxxxxxxxxxxxxxx...')
         self.assertEqual(profile.picture_url, 'http://obs.line-apps.com/...')