support python 3,7

APPx:
Feature or Bugfix:

Author: HMSPushKit

Third Party Open Source Software Notice.docx

@@ -0,0 +1,45 @@
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
+CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
+nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
+43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
+T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
+gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
+BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
+TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
+DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
+hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
+06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
+PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
+YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
+MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
+RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
+gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
+KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
+QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
+XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
+DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
+LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
+RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
+jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
+6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
+mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
+Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
+WD9f
+-----END CERTIFICATE-----
+

LICENSE renamed to python27/LICENSE

@@ -8,6 +8,7 @@
  * [Configuration ](#configuration )
  * [Supported Environments](#supported-environments)
  * [Sample Code](#sample-code)
+ * [Libraries](#Libraries)
  * [License](#license)
 
 
@@ -30,7 +31,7 @@ python setup.py install
 ```
 
 ## Supported Environments
-For pushkit-python-sample, We currently support Python 2.7 and JetBrains PyCharm are recommended.
+For pushkit-python-sample, We currently support Python 2.7/3.7 and JetBrains PyCharm are recommended.
 
 
 ## Configuration 
@@ -86,6 +87,11 @@ Code location: examples/send_apns_message.py
 8) Send a test message.
 Code location: examples/send_test_message.py
 
+## Libraries
+| Library             |     Site
+| -----------------   |     --------------------------------------------------- |
+| requests            |     https://requests.readthedocs.io/en/master/ |
+| six                 |     https://six.readthedocs.io/   |
 ## License
 
 pushkit Python sample is licensed under the [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0).

python27/Push-CA-Root.pem

@@ -1,2 +1,2 @@
 requests >= 2.20.1
-six == 1.1.3.0
+six == 1.13.0

README.md renamed to python27/README.md

@@ -39,7 +39,7 @@
     license='Apache License 2.0',
     keywords='huawei cloud development',
     install_requires=install_requires,
-    packages=['push_admin'],
+    packages=['src/push_admin'],
     python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
     classifiers=[
         'Development Status :: 5 - Production/Stable',

requirements.txt renamed to python27/requirements.txt

@@ -0,0 +1,15 @@
+# -*-coding:utf-8-*-
+#
+# Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+#
+# 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.

setup.py renamed to python27/setup.py

@@ -24,16 +24,17 @@
 _DEFAULT_APP_NAME = 'DEFAULT'
 
 
-def initialize_app(appid, appsecret, token_server='https://oauth-login.cloud.huawei.com/oauth2/v2/token',
+def initialize_app(appid, appsecret, appid_push=None, token_server='https://oauth-login.cloud.huawei.com/oauth2/v2/token',
                    push_open_url='https://push-api.cloud.huawei.com'):
     """
         Initializes and returns a new App instance.
-        :param appid: appid parameters obtained by developer alliance applying for Push service
-        :param appsecret: appsecret parameters obtained by developer alliance applying for Push service
+        :param appid_at: appid parameters obtained by developer alliance applying for Push service
+        :param appsecret_at: appsecret parameters obtained by developer alliance applying for Push service
+        :param appid_push: the application Id in the URL
         :param token_server: Oauth server URL
         :param push_open_url: push open API URL
     """
-    app = _app.App(appid, appsecret, token_server=token_server, push_open_url=push_open_url)
+    app = _app.App(appid, appsecret, appid_push, token_server=token_server, push_open_url=push_open_url)
 
     with _apps_lock:
         if appid not in _apps:

python27/src/__init__.py

@@ -27,10 +27,10 @@ class App(object):
     JSON_ENCODER = _message_serializer.MessageSerializer()
 
     @classmethod
-    def _send_to_server(cls, headers, body, url):
+    def _send_to_server(cls, headers, body, url, verify_peer=False):
         try:
             msg_body = json.dumps(body)
-            response = _http.post(url, msg_body, headers)
+            response = _http.post(url, msg_body, headers, verify_peer)
 
             if response.status_code is not 200:
                 raise ApiCallError('http status code is {0} in send.'.format(response.status_code))
@@ -42,11 +42,15 @@ def _send_to_server(cls, headers, body, url):
         except Exception as e:
             raise ApiCallError('caught exception when send. {0}'.format(e))
 
-    def __init__(self, app_id, app_secret, token_server='https://oauth-login.cloud.huawei.com/oauth2/v2/token',
+    def __init__(self, appid_at, app_secret, appid_push, token_server='https://oauth-login.cloud.huawei.com/oauth2/v2/token',
                  push_open_url='https://push-api.cloud.huawei.com'):
         """class init"""
-        self.app_id = app_id
-        self.app_secret = app_secret
+        self.appid_at = appid_at
+        self.app_secret_at = app_secret
+        if appid_push is None:
+            self.appid_push = appid_at
+        else:
+            self.appid_push = appid_push
         self.token_expired_time = 0
         self.access_token = None
         self.token_server = token_server
@@ -56,20 +60,24 @@ def __init__(self, app_id, app_secret, token_server='https://oauth-login.cloud.h
         self.hw_push_topic_unsub_server = self.push_open_url + "/v1/{0}/topic:unsubscribe"
         self.hw_push_topic_query_server = self.push_open_url + "/v1/{0}/topic:list"
 
-    def _refresh_token(self):
-        """refresh access token"""
+    def _refresh_token(self, verify_peer=False):
+        """refresh access token
+        :param verify_peer: (optional) Either a boolean, in which case it controls whether we verify
+            the server's TLS certificate, or a string, in which case it must be a path
+            to a CA bundle to use. Defaults to ``True``.
+        """
         headers = dict()
         headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=utf-8'
 
         params = dict()
         params['grant_type'] = 'client_credentials'
-        params['client_secret'] = self.app_secret
-        params['client_id'] = self.app_id
+        params['client_secret'] = self.app_secret_at
+        params['client_id'] = self.appid_at
 
         msg_body = urllib.urlencode(params)
 
         try:
-            response = _http.post(self.token_server, msg_body, headers)
+            response = _http.post(self.token_server, msg_body, headers, verify_peer=verify_peer)
 
             if response.status_code is not 200:
                 return False, 'http status code is {0} in get access token'.format(response.status_code)
@@ -91,9 +99,9 @@ def _is_token_expired(self):
             return True
         return long(round(time.time() * 1000)) >= self.token_expired_time
 
-    def _update_token(self):
+    def _update_token(self, verify_peer=False):
         if self._is_token_expired() is True:
-            result, reason = self._refresh_token()
+            result, reason = self._refresh_token(verify_peer)
             if result is False:
                 raise ApiCallError(reason)
 
@@ -103,24 +111,27 @@ def _create_header(self):
         headers['Authorization'] = 'Bearer {0}'.format(self.access_token)
         return headers
 
-    def send(self, message, validate_only):
+    def send(self, message, validate_only, **kwargs):
         """
             Sends the given message Huawei Cloud Messaging (HCM)
             :param message:
             :param validate_only:
+            :param kwargs:
+                   verify_peer: HTTPS server identity verification, use library 'certifi'
             :return:
                 response dict: response body dict
             :raise:
                 ApiCallError: failure reason
         """
-        self._update_token()
+        verify_peer = kwargs['verify_peer']
+        self._update_token(verify_peer)
         headers = self._create_header()
-        url = self.hw_push_server.format(self.app_id)
+        url = self.hw_push_server.format(self.appid_push)
         msg_body_dict = dict()
         msg_body_dict['validate_only'] = validate_only
         msg_body_dict['message'] = App.JSON_ENCODER.default(message)
 
-        return App._send_to_server(headers, msg_body_dict, url)
+        return App._send_to_server(headers, msg_body_dict, url, verify_peer)
 
     def subscribe_topic(self, topic, token_list):
         """
@@ -130,7 +141,7 @@ def subscribe_topic(self, topic, token_list):
         """
         self._update_token()
         headers = self._create_header()
-        url = self.hw_push_topic_sub_server.format(self.app_id)
+        url = self.hw_push_topic_sub_server.format(self.appid_push)
         msg_body_dict = {'topic': topic, 'tokenArray': token_list}
         return App._send_to_server(headers, msg_body_dict, url)
 
@@ -143,7 +154,7 @@ def unsubscribe_topic(self, topic, token_list):
         """
         self._update_token()
         headers = self._create_header()
-        url = self.hw_push_topic_unsub_server.format(self.app_id)
+        url = self.hw_push_topic_unsub_server.format(self.appid_push)
         msg_body_dict = {'topic': topic, 'tokenArray': token_list}
         return App._send_to_server(headers, msg_body_dict, url)
 
@@ -154,7 +165,7 @@ def query_subscribe_list(self, token):
         """
         self._update_token()
         headers = self._create_header()
-        url = self.hw_push_topic_query_server.format(self.app_id)
+        url = self.hw_push_topic_query_server.format(self.appid_push)
         msg_body_dict = {'token': token}
         return App._send_to_server(headers, msg_body_dict, url)
 

src/push_admin/__init__.py renamed to python27/src/push_admin/__init__.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+#
+# 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 requests
+
+
+def post(url, req_body, headers=None, verify_peer=False):
+    """ post http request to slb service
+        :param url: url path
+        :param req_body: http request body
+        :param headers: http headers
+         :param verify_peer:  (optional) Either a boolean, in which case it controls whether we verify
+            the server's TLS certificate, or a string, in which case it must be a path
+            to a CA bundle to use. Defaults to ``True``.
+        :return:
+            success return response
+            fali return None
+    """
+    try:
+        response = requests.post(url, data=req_body, headers=headers, timeout=10, verify=verify_peer)
+        return response
+
+    except Exception as e:
+        raise ValueError('caught exception when post {0}. {1}'.format(url, e))
+
+
+def _format_http_text(method, url, headers, body):
+    """
+    print http head and body for request or response
+
+    For examples: _format_http_text('', title, response.headers, response.text)
+    """
+    result = method + ' ' + url + '\n'
+
+    if headers is not None:
+        for key, value in headers.items():
+            result = result + key + ': ' + value + '\n'
+
+    result = result + body
+    return result
+
+

src/push_admin/_app.py renamed to python27/src/push_admin/_app.py

@@ -50,18 +50,21 @@
 ApiCallError = _app.ApiCallError
 
 
-def send_message(message, validate_only=False, app_id=None):
+def send_message(message, validate_only=False, app_id=None, verify_peer=False):
     """
         Sends the given message Huawei Cloud Messaging (HCM)
         :param message: An instance of ``messaging.Message``.
         :param validate_only: A boolean indicating whether to run the operation in dry run mode (optional).
         :param app_id: app id parameters obtained by developer alliance applying for Push service (optional).
+        :param verify_peer: (optional) Either a boolean, in which case it controls whether we verify
+            the server's TLS certificate, or a string, in which case it must be a path
+            to a CA bundle to use. Defaults to ``True``.
         :return: SendResponse
         Raises:
             ApiCallError: If an error occurs while sending the message to the HCM service.
     """
     try:
-        response = push_admin.get_app(app_id).send(message, validate_only)
+        response = push_admin.get_app(app_id).send(message, validate_only, verify_peer=verify_peer)
         return SendResponse(response)
     except Exception as e:
         raise ApiCallError(repr(e))
@@ -112,8 +115,8 @@ class SendResponse(object):
     """
     def __init__(self, response=None):
         try:
-            self._code = response['code']
             self._msg = response['msg']
+            self._code = response['code']
             self._requestId = response['requestId']
         except Exception as e:
             raise ValueError(format(repr(e)))

python27/src/push_admin/_http.py

@@ -0,0 +1,15 @@
+# -*-coding:utf-8-*-
+#
+# Copyright 2020. Huawei Technologies Co., Ltd. All rights reserved.
+#
+# 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.