summaryrefslogtreecommitdiff
path: root/web/apps
diff options
context:
space:
mode:
Diffstat (limited to 'web/apps')
-rw-r--r--web/apps/test_records/serializer.py4
-rw-r--r--web/apps/test_records/views.py18
-rw-r--r--web/apps/user_operation/filters.py2
-rw-r--r--web/apps/user_operation/views.py4
-rw-r--r--web/apps/users/admin.py2
-rw-r--r--web/apps/users/jwt_handler.py2
6 files changed, 16 insertions, 16 deletions
diff --git a/web/apps/test_records/serializer.py b/web/apps/test_records/serializer.py
index 5decb02..99759cd 100644
--- a/web/apps/test_records/serializer.py
+++ b/web/apps/test_records/serializer.py
@@ -246,7 +246,7 @@ class TestStatusRecordListSerializer(serializers.ModelSerializer):
if (data_list_count == trend['none']):
trend['is_first'] = True
- print str(data_list_count)
+ print(str(data_list_count))
return trend
def get_machine_info(self, obj):
@@ -306,7 +306,7 @@ class TestRecordListSerializer(serializers.ModelSerializer):
if (data_list_count == trend['none']):
trend['is_first'] = True
- print str(data_list_count)
+ print(str(data_list_count))
return trend
def get_machine_info(self, obj):
diff --git a/web/apps/test_records/views.py b/web/apps/test_records/views.py
index d09484b..f681568 100644
--- a/web/apps/test_records/views.py
+++ b/web/apps/test_records/views.py
@@ -7,9 +7,9 @@ import shortuuid
from django.contrib.auth.hashers import make_password
from rest_framework.pagination import PageNumberPagination
-from exception import TestDataUploadError
-from test_records.filters import TestRecordListFilter
-from models import UserMachine, TestCategory, TestBranch
+from .exception import TestDataUploadError
+from .filters import TestRecordListFilter
+from .models import UserMachine, TestCategory, TestBranch
from pgperffarm.settings import DB_ENUM
from user_operation.views import UserMachinePermission
from .serializer import MachineHistoryRecordSerializer, TestStatusRecordListSerializer, TestBranchSerializer, \
@@ -115,7 +115,7 @@ def TestRecordCreate(request, format=None):
print(request.__str__())
data = request.data
- print type(data[0])
+ print(type(data[0]))
json_data = json.dumps(data[0], encoding="UTF-8", ensure_ascii=False)
json_data = json.loads(json_data, encoding="UTF-8")
# obj = data[0].pgbench
@@ -211,11 +211,11 @@ def TestRecordCreate(request, format=None):
if not test_cate:
continue
else:
- print test_cate.cate_name
+ print(test_cate.cate_name)
for scale, dataset_list in tag_list.iteritems():
- print "ro[%s]=" % scale, dataset_list
+ print("ro[%s]=" % scale, dataset_list)
for client_num, dataset in dataset_list.iteritems():
- print 'std is:' + str(dataset['std'])
+ print('std is:' + str(dataset['std']))
test_dataset_data = {
'test_record': testRecordRet.id,
@@ -232,7 +232,7 @@ def TestRecordCreate(request, format=None):
testDateSet = CreateTestDateSetSerializer(data=test_dataset_data)
testDateSetRet = None
if testDateSet.is_valid():
- print 'dataset valid'
+ print('dataset valid')
testDateSetRet = testDateSet.save()
else:
# print(testDateSet.errors)
@@ -248,7 +248,7 @@ def TestRecordCreate(request, format=None):
testResultRet = None
if testResult.is_valid():
- print 'testResult valid'
+ print('testResult valid')
testResultRet = testResult.save()
else:
# print(testResult.error_messages)
diff --git a/web/apps/user_operation/filters.py b/web/apps/user_operation/filters.py
index d429d96..a61ac8e 100644
--- a/web/apps/user_operation/filters.py
+++ b/web/apps/user_operation/filters.py
@@ -3,7 +3,7 @@
import django_filters
from django.db.models import Q
-from models import UserMachine
+from .models import UserMachine
from test_records.models import TestRecord
diff --git a/web/apps/user_operation/views.py b/web/apps/user_operation/views.py
index e7641cf..43696f6 100644
--- a/web/apps/user_operation/views.py
+++ b/web/apps/user_operation/views.py
@@ -8,11 +8,11 @@ from rest_framework import authentication
from rest_framework.pagination import PageNumberPagination
from rest_framework_jwt.authentication import JSONWebTokenAuthentication
-from filters import MachineRecordListFilter, UserMachineListFilter
+from .filters import MachineRecordListFilter, UserMachineListFilter
from test_records.models import TestRecord
from users.models import UserMachine, UserProfile
from users.serializer import CreateUserProfileSerializer
-from serializer import UserMachineManageSerializer, UserPortalInfoSerializer, TestRecordListSerializer, \
+from .serializer import UserMachineManageSerializer, UserPortalInfoSerializer, TestRecordListSerializer, \
UserMachineSerializer, CreateUserMachineSerializer
from rest_framework.response import Response
from rest_framework import status
diff --git a/web/apps/users/admin.py b/web/apps/users/admin.py
index 2c31eef..c7ef0fa 100644
--- a/web/apps/users/admin.py
+++ b/web/apps/users/admin.py
@@ -5,7 +5,7 @@ from django.contrib import admin
from asynchronous_send_mail import send_mail
from django.conf import settings
# Register your models here.
-from serializer import UserMachineSerializer
+from .serializer import UserMachineSerializer
from .models import UserMachine, UserProfile
class UserProfileAdmin(admin.ModelAdmin):
diff --git a/web/apps/users/jwt_handler.py b/web/apps/users/jwt_handler.py
index 7dfdb94..ff8fdaa 100644
--- a/web/apps/users/jwt_handler.py
+++ b/web/apps/users/jwt_handler.py
@@ -1,4 +1,4 @@
-from serializer import JWTUserProfileSerializer
+from .serializer import JWTUserProfileSerializer
# user jwt handler
def jwt_response_payload_handler(token, user=None, request=None):