walle 2.0 alpha - 支持python 3.5+

tests/test_01_api_environment.py

@@ -79,7 +79,7 @@ class TestApiEnv(TestApiBase):
         response = {
             'count': 2,
         }
-        resp = client.get('%s/?%s' % (self.uri_prefix, urllib.urlencode(query)))
+        resp = client.get('%s/?%s' % (self.uri_prefix, urlencode(query)))
         response_success(resp)
         resp_dict = resp_json(resp)
 
@@ -96,7 +96,7 @@ class TestApiEnv(TestApiBase):
         response = {
             'count': 1,
         }
-        resp = client.get('%s/?%s' % (self.uri_prefix, urllib.urlencode(query)))
+        resp = client.get('%s/?%s' % (self.uri_prefix, urlencode(query)))
         response_success(resp)
         resp_dict = resp_json(resp)
 

tests/test_02_api_role.py

@@ -72,7 +72,7 @@ class TestApiRole(TestApiBase):
         #     response = {
         #         'count': 1,
         #     }
-        #     resp = client.get('%s/?%s' % (self.uri_prefix, urllib.urlencode(query)))
+        #     resp = client.get('%s/?%s' % (self.uri_prefix, urlencode(query)))
         #     response_success(resp)
         #     resp_dict = resp_json(resp)
         #

tests/test_03_api_user.py

@@ -106,7 +106,7 @@ class TestApiUser:
         response = {
             'count': 7,
         }
-        resp = client.get('%s/?%s' % (self.uri_prefix, urllib.urlencode(query)))
+        resp = client.get('%s/?%s' % (self.uri_prefix, urlencode(query)))
         response_success(resp)
         resp_dict = resp_json(resp)
 
@@ -123,7 +123,7 @@ class TestApiUser:
         response = {
             'count': 1,
         }
-        resp = client.get('%s/?%s' % (self.uri_prefix, urllib.urlencode(query)))
+        resp = client.get('%s/?%s' % (self.uri_prefix, urlencode(query)))
         response_success(resp)
         resp_dict = resp_json(resp)
 

tests/test_04_api_passport.py

@@ -32,7 +32,7 @@ class TestApiPassport:
         response = {
             'count': 1,
         }
-        resp = client.get('/api/user/?%s' % (urllib.urlencode(query)))
+        resp = client.get('/api/user/?%s' % (urlencode(query)))
         response_success(resp)
         compare_req_resp(response, resp)
 

tests/test_05_api_space.py

@@ -100,7 +100,7 @@ class TestApiSpace(TestApiBase):
         #     response = {
         #         'count': 2,
         #     }
-        #     resp = client.get('%s/?%s' % (self.uri_prefix, urllib.urlencode(query)))
+        #     resp = client.get('%s/?%s' % (self.uri_prefix, urlencode(query)))
         #     response_success(resp)
         #     resp_dict = resp_json(resp)
         #
@@ -124,7 +124,7 @@ class TestApiSpace(TestApiBase):
         #     response = {
         #         'count': 1,
         #     }
-        #     resp = client.get('%s/?%s' % (self.uri_prefix, urllib.urlencode(query)))
+        #     resp = client.get('%s/?%s' % (self.uri_prefix, urlencode(query)))
         #     response_success(resp)
         #     resp_dict = resp_json(resp)
         #     space_data_2 = self.get_list_ids(self.space_data_2)

tests/test_06_api_server.py

@@ -79,7 +79,7 @@ class TestApiServer(TestApiBase):
         response = {
             'count': 2,
         }
-        resp = client.get('%s/?%s' % (self.uri_prefix, urllib.urlencode(query)))
+        resp = client.get('%s/?%s' % (self.uri_prefix, urlencode(query)))
         response_success(resp)
         resp_dict = resp_json(resp)
 
@@ -96,7 +96,7 @@ class TestApiServer(TestApiBase):
         response = {
             'count': 1,
         }
-        resp = client.get('%s/?%s' % (self.uri_prefix, urllib.urlencode(query)))
+        resp = client.get('%s/?%s' % (self.uri_prefix, urlencode(query)))
         response_success(resp)
         resp_dict = resp_json(resp)
 

tests/test_07_api_project.py

@@ -154,7 +154,7 @@ class TestApiProject(TestApiBase):
         response = {
             'count': 2,
         }
-        resp = client.get('%s/?%s' % (self.uri_prefix, urllib.urlencode(query)))
+        resp = client.get('%s/?%s' % (self.uri_prefix, urlencode(query)))
         response_success(resp)
         resp_dict = resp_json(resp)
 
@@ -171,7 +171,7 @@ class TestApiProject(TestApiBase):
         response = {
             'count': 1,
         }
-        resp = client.get('%s/?%s' % (self.uri_prefix, urllib.urlencode(query)))
+        resp = client.get('%s/?%s' % (self.uri_prefix, urlencode(query)))
         response_success(resp)
         resp_dict = resp_json(resp)
 

tests/test_08_api_task.py

@@ -95,7 +95,7 @@ class TestApiTask(TestApiBase):
         response = {
             'count': 2,
         }
-        resp = client.get('%s/?%s' % (self.uri_prefix, urllib.urlencode(query)))
+        resp = client.get('%s/?%s' % (self.uri_prefix, urlencode(query)))
         response_success(resp)
         resp_dict = resp_json(resp)
 
@@ -112,7 +112,7 @@ class TestApiTask(TestApiBase):
         response = {
             'count': 1,
         }
-        resp = client.get('%s/?%s' % (self.uri_prefix, urllib.urlencode(query)))
+        resp = client.get('%s/?%s' % (self.uri_prefix, urlencode(query)))
         response_success(resp)
         resp_dict = resp_json(resp)
 

tests/utils.py

@@ -7,8 +7,17 @@
     :author: wushuiyong@walle-web.io
 """
 import json
+import sys
 from flask import current_app
 
+PY2 = int(sys.version[0]) == 2
+
+if PY2:
+    from urllib import urlencode
+else:
+    from urllib.parse import urlencode
+
+
 def response_success(response):
     assert 200 <= response.status_code < 300, 'Received %d response: %s' % (response.status_code, response.data)
     resp = resp_json(response)

walle/api/project.py

@@ -115,7 +115,7 @@ class ProjectAPI(SecurityResource):
         super(ProjectAPI, self).put()
 
         if action and action == 'members':
-            return self.members(project_id, members=json.loads(request.data))
+            return self.members(project_id, members=json.loads(request.data.decode('utf-8')))
 
         form = ProjectForm(request.form, csrf=False)
         form.set_id(project_id)

walle/model/database.py

@@ -70,8 +70,8 @@ def parse_operator(cls, filter_name_dict):
             return value
 
     binary_expression_list = []
-    for field, op_dict in filter_name_dict.items():
-        for op, op_val in op_dict.items():
+    for field, op_dict in list(filter_name_dict.items()):
+        for op, op_val in list(op_dict.items()):
             op_val = _change_type(cls, field, op_val)
             if op in OPERATOR_FUNC_DICT:
                 binary_expression_list.append(
@@ -99,7 +99,7 @@ class CRUDMixin(object):
 
     def update(self, commit=True, **kwargs):
         """Update specific fields of a record."""
-        for attr, value in kwargs.items():
+        for attr, value in list(kwargs.items()):
             setattr(self, attr, value)
         return commit and self.save() or self
 

walle/service/utils.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """Helper utilities and decorators."""
-from __future__ import print_function
+
 
 import sys
 import time
@@ -14,7 +14,7 @@ from invoke import Responder
 
 def flash_errors(form, category='warning'):
     """Flash all errors for a form."""
-    for field, errors in form.errors.items():
+    for field, errors in list(form.errors.items()):
         for error in errors:
             flash('{0} - {1}'.format(getattr(form, field).label.text, error), category)