🐛 fix engine unicode errror

Author: aisk

leancloud/engine/__init__.py

@@ -7,12 +7,14 @@
 
 import sys
 import json
+import warnings
 
 from werkzeug.wrappers import Request
 from werkzeug.wrappers import Response
 from werkzeug.serving import run_simple
 
 import leancloud
+from . import utils
 from . import leanengine
 from .authorization import AuthorizationMiddleware
 from .cookie_session import CookieSessionMiddleware
@@ -61,7 +63,7 @@ def __call__(self, environ, start_response):
         environ['leanengine.request'] = request  # cache werkzeug request for other middlewares
 
         if request.path in ('/__engine/1/ping', '/__engine/1.1/ping/'):
-            start_response('200 OK', [('Content-Type', 'application/json')])
+            start_response(utils.to_native('200 OK'), [(utils.to_native('Content-Type'), utils.to_native('application/json'))])
             version = sys.version_info
             return Response(json.dumps({
                 'version': leancloud.__version__,

leancloud/engine/authorization.py

@@ -8,7 +8,6 @@
 import os
 import json
 
-import six
 from werkzeug.wrappers import Response
 
 from . import utils

leancloud/engine/cors.py

@@ -5,10 +5,12 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
+from . import utils
+
 
 class CORSMiddleware(object):
-    ALLOW_ORIGIN = "*"
-    ALLOW_HEADERS = ', '.join([
+    ALLOW_ORIGIN = utils.to_native('*')
+    ALLOW_HEADERS = utils.to_native(', '.join([
         'Content-Type',
         'X-AVOSCloud-Application-Id',
         'X-AVOSCloud-Application-Key',
@@ -30,28 +32,28 @@ class CORSMiddleware(object):
         'X-LC-Session',
         'X-LC-Sign',
         'X-LC-UA',
-    ])
-    ALLOW_METHODS = ', '.join(['PUT', 'GET', 'POST', 'DELETE', 'OPTIONS'])
-    MAX_AGE = '86400'
+    ]))
+    ALLOW_METHODS = utils.to_native(', '.join(['PUT', 'GET', 'POST', 'DELETE', 'OPTIONS']))
+    MAX_AGE = utils.to_native('86400')
 
     def __init__(self, app):
         self.app = app
 
     def __call__(self, environ, start_response):
         if environ['REQUEST_METHOD'] == 'OPTIONS':
-            start_response('200 OK', [
-                ('Access-Control-Allow-Origin', environ.get('HTTP_ORIGIN', self.ALLOW_ORIGIN)),
-                ('Access-Control-Allow-Headers', self.ALLOW_HEADERS),
-                ('Access-Control-Allow-Methods', self.ALLOW_METHODS),
-                ('Access-Control-Max-Age', self.MAX_AGE)
+            start_response(utils.to_native('200 OK'), [
+                (utils.to_native('Access-Control-Allow-Origin'), environ.get('HTTP_ORIGIN', self.ALLOW_ORIGIN)),
+                (utils.to_native('Access-Control-Allow-Headers'), self.ALLOW_HEADERS),
+                (utils.to_native('Access-Control-Allow-Methods'), self.ALLOW_METHODS),
+                (utils.to_native('Access-Control-Max-Age'), self.MAX_AGE)
             ])
-            return [b'']
+            return [utils.to_native('')]
         else:
             def cors_start_response(status, headers, exc_info=None):
-                headers.append(('Access-Control-Allow-Origin', self.ALLOW_ORIGIN))
-                headers.append(('Access-Control-Allow-Headers', self.ALLOW_HEADERS))
-                headers.append(('Access-Control-Allow-Methods', self.ALLOW_METHODS))
-                headers.append(('Access-Control-Max-Age', self.MAX_AGE))
+                headers.append((utils.to_native('Access-Control-Allow-Origin'), self.ALLOW_ORIGIN))
+                headers.append((utils.to_native('Access-Control-Allow-Headers'), self.ALLOW_HEADERS))
+                headers.append((utils.to_native('Access-Control-Allow-Methods'), self.ALLOW_METHODS))
+                headers.append((utils.to_native('Access-Control-Max-Age'), self.MAX_AGE))
                 return start_response(status, headers, exc_info)
 
             return self.app(environ, cors_start_response)

leancloud/engine/utils.py

@@ -7,9 +7,24 @@
 
 import hashlib
 
+import six
+
+
 __author__ = 'asaka <lan@leancloud.rocks>'
 
 
 def sign_by_key(timestamp, key):
     s = '{0}{1}'.format(timestamp, key)
     return hashlib.md5(s.encode('utf-8')).hexdigest()
+
+
+if six.PY2:
+    def to_native(s):
+        if isinstance(s, unicode):
+            return s.encode('utf-8')
+        return s
+else:
+    def to_native(s):
+        if isinstance(s, bytes):
+            return s.decode('utf-8')
+        return s