replace json to ujson

This commit is contained in:
yanchunhuo 2019-10-24 14:25:52 +08:00
parent 85794f0ecc
commit 3d32f2d4c8
6 changed files with 17 additions and 16 deletions

View File

@ -19,7 +19,7 @@ from selenium.webdriver.common.by import By
import allure
import base64
import json
import ujson
import os
class AppOperator:
@ -34,7 +34,7 @@ class AppOperator:
self._driver=driver
self._session_id=driver.session_id
# 获得设备支持的性能数据类型
self._performance_types=json.loads(self._doRequest.post_with_form('/session/'+self._session_id+'/appium/performanceData/types').body)['value']
self._performance_types=ujson.loads(self._doRequest.post_with_form('/session/'+self._session_id+'/appium/performanceData/types').body)['value']
# 获取当前窗口大小
self._windows_size=self.get_window_size()
@ -360,7 +360,7 @@ class AppOperator:
location.update({'longitude':longitude})
location.update({'altitude':altitude})
geolocation.update({'location':location})
self._doRequest.post_with_form('/session/'+self._session_id+'/location',params=json.dumps(geolocation))
self._doRequest.post_with_form('/session/'+self._session_id+'/location',params=ujson.dumps(geolocation))
def get_current_activity(self):
"""
@ -519,7 +519,7 @@ class AppOperator:
params.update({'packageName':package_name})
params.update({'dataType':data_type})
params.update({'dataReadTimeout':data_read_timeout})
httpResponseResult=self._doRequest.post_with_form('/session/'+self._session_id+'/appium/getPerformanceData',params=json.dumps(params))
httpResponseResult=self._doRequest.post_with_form('/session/'+self._session_id+'/appium/getPerformanceData',params=ujson.dumps(params))
return httpResponseResult.body
else:
return None
@ -590,7 +590,7 @@ class AppOperator:
"""
context={}
context.update({'name':context_name})
self._doRequest.post_with_form('/session/'+self._session_id+'/context',params=json.dumps(context))
self._doRequest.post_with_form('/session/'+self._session_id+'/context',params=ujson.dumps(context))
def mouse_move_to(self,element,xoffset=None,yoffset=None):
"""

View File

@ -1,5 +1,5 @@
#!-*- coding:utf8 -*-
import json
import ujson
import os
import re
@ -13,7 +13,7 @@ class FileTool:
:param filePath:
:return:
"""
str = json.dumps(obj, default=lambda obj: obj.__dict__)
str = ujson.dumps(obj)
with open(filePath,'w') as f:
f.write(str)
f.close()
@ -28,7 +28,7 @@ class FileTool:
with open(filePath,'r') as f:
result=f.read()
f.close()
result=json.loads(result)
result=ujson.loads(result)
return result
@classmethod

View File

@ -1,5 +1,5 @@
#!-*- coding:utf8 -*-
import json
import ujson
import re
import random
import string
@ -52,7 +52,7 @@ class StrTool:
:param object:
:return:
"""
return json.dumps(object, default=lambda obj: obj.__dict__)
return ujson.dumps(object)
@classmethod
def objectToJson(cls,object):
@ -61,7 +61,7 @@ class StrTool:
:param object:
:return:
"""
return json.loads(json.dumps(object, default=lambda obj: obj.__dict__))
return ujson.loads(ujson.dumps(object))
@classmethod
def getSpecifiedStr(cls,length,char):

View File

@ -10,4 +10,5 @@ JPype1==0.6.3
paramiko==2.4.0
Pillow==5.3.0
PyMySQL==0.8.0
redis==2.10.6
redis==2.10.6
ujson==1.35

View File

@ -9,7 +9,7 @@ from init.app_ui.winwos.windows_init import windows_init
from init.java.java_maven_init import java_maven_init
import argparse
import jpype
import json
import ujson
import pytest
import sys
@ -26,7 +26,7 @@ if __name__=='__main__':
doRquest=DoRequest(Read_APP_UI_Config().app_ui_config.appium_hub)
httpResponseResult=doRquest.get('/status')
result=json.loads(httpResponseResult.body)
result=ujson.loads(httpResponseResult.body)
if result['status']==0:
print('appium server状态为可用......')
else:

View File

@ -6,7 +6,7 @@ from init.web_ui.web_ui_init import web_ui_init
from selenium.webdriver.remote.remote_connection import RemoteConnection
from selenium.webdriver.remote.command import Command
import argparse
import json
import ujson
import pytest
import sys
@ -22,7 +22,7 @@ if __name__=='__main__':
try:
doRquest=DoRequest(Read_WEB_UI_Config().web_ui_config.selenium_hub)
httpResponseResult=doRquest.get('/status')
result=json.loads(httpResponseResult.body)
result=ujson.loads(httpResponseResult.body)
if result['status']==0:
print('selenium server状态为可用......')
else: