Merge pull request #1 from okdtsk/review_okdtsk

Review by Tasuku OKUDA

Author: be-hase

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright 2016 LINE Corporation.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

examples/flask-echo/app.py

@@ -1,4 +1,16 @@
 # -*- coding: utf-8 -*-
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 from __future__ import unicode_literals
 
 import os

examples/flask-echo/app_with_handler.py

@@ -1,3 +1,16 @@
+# -*- coding: utf-8 -*-
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 import os
 import sys
 from argparse import ArgumentParser

examples/flask-kitchensink/app.py

@@ -1,4 +1,16 @@
 # -*- coding: utf-8 -*-
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 from __future__ import unicode_literals
 
 import errno

examples/simple-server-echo/app.py

@@ -1,4 +1,16 @@
 # -*- coding: utf-8 -*-
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 import os
 import sys
 import wsgiref.simple_server

linebot/__about__.py

@@ -1,7 +1,22 @@
 # -*- coding: utf-8 -*-
+#  Licensed under the Apache License, Version 2.0 (the 'License'); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an 'AS IS' BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 from __future__ import unicode_literals
 
 __version__ = '0.1.0'
+__author__ = 'LINE Corporation'
+__copyright__ = 'Copyright 2016, LINE Corporation'
+__license__ = 'Apache 2.0'
 
 __all__ = (
     '__version__'

linebot/__init__.py

@@ -1,4 +1,16 @@
 # -*- coding: utf-8 -*-
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 from __future__ import unicode_literals
 
 from .__about__ import (

linebot/api.py

@@ -1,24 +1,32 @@
 # -*- coding: utf-8 -*-
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 from __future__ import unicode_literals
 
 import json
 
 from .__about__ import __version__
 from .exceptions import LineBotApiError
-from .http_client import (
-    RequestsHttpClient, HttpClient
-)
+from .http_client import RequestsHttpClient
 from .models.error import Error
 from .models.profile import Profile
 
 
 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=RequestsHttpClient.DEFAULT_TIMEOUT, http_client=RequestsHttpClient):
         """Constructor of LineBotApi Client
 
         Args:
@@ -114,9 +122,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 +187,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/exceptions.py

@@ -1,4 +1,16 @@
 # -*- coding: utf-8 -*-
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 from __future__ import unicode_literals
 
 

linebot/http_client.py

@@ -1,15 +1,27 @@
 # -*- coding: utf-8 -*-
+#  Licensed under the Apache License, Version 2.0 (the "License"); you may
+#  not use this file except in compliance with the License. You may obtain
+#  a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#  License for the specific language governing permissions and limitations
+#  under the License.
+
 from __future__ import unicode_literals
 
+from abc import ABCMeta, abstractmethod
+from future.utils import with_metaclass
 import requests
 
 
-class HttpClient(object):
+class HttpClient(with_metaclass(ABCMeta)):
     DEFAULT_TIMEOUT = 5
 
-    def __init__(
-            self, timeout=DEFAULT_TIMEOUT
-    ):
+    def __init__(self, timeout=DEFAULT_TIMEOUT):
         """Constructor of HttpClient
 
         Args:
@@ -19,6 +31,7 @@ def __init__(
 
         self.timeout = timeout
 
+    @abstractmethod
     def get(self, url, headers=None, params=None, timeout=None):
         """GET request
 
@@ -32,6 +45,7 @@ def get(self, url, headers=None, params=None, timeout=None):
         """
         raise NotImplementedError
 
+    @abstractmethod
     def get_stream(self, url, headers=None, params=None, timeout=None,
                    chunk_size=1024, decode_unicode=False):
         """GET request. response is chunk content.
@@ -47,6 +61,7 @@ def get_stream(self, url, headers=None, params=None, timeout=None,
         """
         raise NotImplementedError
 
+    @abstractmethod
     def post(self, url, headers=None, data=None, timeout=None):
         """POST request.
 
@@ -61,9 +76,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.