From 43799d3b565d2a3798b2d7d618fcb6616774c44d Mon Sep 17 00:00:00 2001 From: wenxianping <931128603@qq.com> Date: Thu, 3 Jan 2019 20:38:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agency/cdn_utils.py | 7 +++-- config/configCommon.py | 7 ++++- config/ticketConf.py | 2 +- config/ticket_config.yaml | 10 +++--- damatuCode/ruokuai.py | 2 +- init/login.py | 10 ------ init/select_ticket_info.py | 52 +++++++++++++++--------------- inter/CheckOrderInfo.py | 4 +-- inter/GetRandCode.py | 2 +- inter/Query.py | 4 +-- inter/QueryOrderWaitTime.py | 4 +-- myUrllib/myurllib2.py | 63 ------------------------------------- 12 files changed, 52 insertions(+), 115 deletions(-) delete mode 100755 myUrllib/myurllib2.py diff --git a/agency/cdn_utils.py b/agency/cdn_utils.py index 0b77ba1..dad4dbe 100755 --- a/agency/cdn_utils.py +++ b/agency/cdn_utils.py @@ -6,8 +6,9 @@ import sys import csv import requests from config import urlConf -reload(sys) -sys.setdefaultencoding('utf-8') +if sys.version_info.major == 2: + reload(sys) + sys.setdefaultencoding('utf-8') class CDNProxy: @@ -42,7 +43,7 @@ class CDNProxy: city_re = re.compile(r"
  • self.open_time: + break + time.sleep(0.0001) else: sleep_time_s = 0.5 sleep_time_t = 3 @@ -275,19 +277,19 @@ class select: random_time)) time.sleep(random_time) except PassengerUserException as e: - print e.message + print(e.message) break except ticketConfigException as e: - print e.message + print(e.message) break except ticketIsExitsException as e: - print e.message + print(e.message) break except ticketNumOutException as e: - print e.message + print(e.message) break except UserPasswordException as e: - print e.message + print(e.message) break except ValueError as e: if e.message == "No JSON object could be decoded": diff --git a/inter/CheckOrderInfo.py b/inter/CheckOrderInfo.py index 867ee2f..7dcb4ab 100644 --- a/inter/CheckOrderInfo.py +++ b/inter/CheckOrderInfo.py @@ -68,7 +68,7 @@ class checkOrderInfo: self.passengerTicketStrList, ) QueueCount.sendGetQueueCount() - elif "errMsg" in checkOrderInfoRep['data'] and checkOrderInfoRep['data']["errMsg"]: - print checkOrderInfoRep['data']["errMsg"] + elif "errMsg" in data and data["errMsg"]: + print(checkOrderInfoRep['data']["errMsg"]) elif 'messages' in checkOrderInfoRep and checkOrderInfoRep['messages']: print (checkOrderInfoRep['messages'][0]) \ No newline at end of file diff --git a/inter/GetRandCode.py b/inter/GetRandCode.py index 49008f5..054735d 100644 --- a/inter/GetRandCode.py +++ b/inter/GetRandCode.py @@ -23,7 +23,7 @@ def getRandCode(is_auto_code, auto_code_type, result): return codexy(Ofset=",".join(list(Result["Result"])), is_raw_input=False) else: if "Error" in Result and Result["Error"]: - print u"打码平台错误: {0}, 请登录打码平台查看-http://www.ruokuai.com/client/index?6726".format(Result["Error"]) + print(u"打码平台错误: {0}, 请登录打码平台查看-http://www.ruokuai.com/client/index?6726".format(Result["Error"])) return "" else: img = Image.open('./tkcode') diff --git a/inter/Query.py b/inter/Query.py index 81d5239..3721224 100644 --- a/inter/Query.py +++ b/inter/Query.py @@ -117,7 +117,7 @@ class query: start_time = ticket_info[8] arrival_time = ticket_info[9] distance_time = ticket_info[10] - print start_time, arrival_time, distance_time + print(start_time, arrival_time, distance_time) seat = j try: ticket_num = int(ticket_info[j]) @@ -160,7 +160,7 @@ class query: "status": True, } else: - print u"车次配置信息有误，或者返回数据异常，请检查 {}".format(station_ticket) + print(u"车次配置信息有误，或者返回数据异常，请检查 {}".format(station_ticket)) return {"code": ticket.FAIL_CODE, "status": False} diff --git a/inter/QueryOrderWaitTime.py b/inter/QueryOrderWaitTime.py index 6a77ce4..9dbc888 100644 --- a/inter/QueryOrderWaitTime.py +++ b/inter/QueryOrderWaitTime.py @@ -45,7 +45,7 @@ class queryOrderWaitTime: raise ticketIsExitsException(ticket.WAIT_ORDER_SUCCESS.format( data.get("orderId"))) elif data.get("msg", False): - print data.get("msg", "") + print(data.get("msg", "")) break elif data.get("waitTime", False): print(ticket.WAIT_ORDER_CONTINUE.format(0 - data.get("waitTime", False))) @@ -83,7 +83,7 @@ class queryOrderWaitTime: queryMyOrderNoCompleteResult["data"]["orderCacheDTO"]["message"]["message"]) else: if queryMyOrderNoCompleteResult.get("message", False): - print queryMyOrderNoCompleteResult.get("message", False) + print(queryMyOrderNoCompleteResult.get("message", False)) return False else: return False diff --git a/myUrllib/myurllib2.py b/myUrllib/myurllib2.py deleted file mode 100755 index 6b36cb3..0000000 --- a/myUrllib/myurllib2.py +++ /dev/null @@ -1,63 +0,0 @@ -# -*- coding=utf-8 -*- -import httplib -import ssl -import urllib -import urllib2 -import sys -from cookielib import LWPCookieJar - -reload(sys) -sys.setdefaultencoding('UTF8') -cookiejar = LWPCookieJar() -cookiesuppor = urllib2.HTTPCookieProcessor(cookiejar) -opener = urllib2.build_opener(cookiesuppor, urllib2.HTTPHandler) -urllib2.install_opener(opener) -ssl._create_default_https_context = ssl._create_unverified_context - - -def get(url): - try: - request = urllib2.Request(url=url) - request.add_header("Content-Type", "application/x-www-form-urlencoded; charset=utf-8") - request.add_header('X-Requested-With', 'xmlHttpRequest') - request.add_header('User-Agent', "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36" - ) - request.add_header('Referer', 'https://kyfw.12306.cn/otn/confirmPassenger/initDc') - request.add_header('Accept', '*/*') - result = urllib2.urlopen(request).read() - assert isinstance(result, object) - return result - except httplib.error as e: - print e - pass - except urllib2.URLError as e: - print e - pass - except urllib2.HTTPBasicAuthHandler, urllib2.HTTPError: - pass - - -def Post(url, data): - try: - request = urllib2.Request(url=url, data=urllib.urlencode(data)) - # req.add_header('User-Agent', 'Mozilla/5.0 (X11; Fedora; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0') - # request = urllib2Post.Request(ajax_url, urllib.urlencode(dc)) - request.add_header("Content-Type", "application/x-www-form-urlencoded;application/json;charset=utf-8") - request.add_header('X-Requested-With', 'xmlHttpRequest') - request.add_header('User-Agent', "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36" - ) - request.add_header('Referer', 'https://kyfw.12306.cn/otn/confirmPassenger/initDc') - request.add_header('Accept', '*/*') - # request.add_header('Accept-Encoding', 'gzip, deflate') - for i in range(3): - result = urllib2.urlopen(request).read() - if result: - return result - else: - print("返回结果为空，正在第{0}重试".format(i)) - except httplib.error as e: - return e - except urllib2.URLError as e: - return e - except urllib2.HTTPBasicAuthHandler, urllib2.HTTPError: - return ('error') \ No newline at end of file