mirror of https://github.com/testerSunshine/12306
Merge pull request #101 from cclauss/patch-4
Use feature detection instead of version detectionpull/108/head
commit
37f20eda21
|
@ -7,10 +7,12 @@ import sys
|
||||||
import csv
|
import csv
|
||||||
import requests
|
import requests
|
||||||
from config import urlConf
|
from config import urlConf
|
||||||
if sys.version_info.major == 2:
|
|
||||||
|
try:
|
||||||
reload(sys)
|
reload(sys)
|
||||||
sys.setdefaultencoding('utf-8')
|
sys.setdefaultencoding('utf-8')
|
||||||
|
except NameError:
|
||||||
|
pass
|
||||||
|
|
||||||
class CDNProxy:
|
class CDNProxy:
|
||||||
def __init__(self, host=None):
|
def __init__(self, host=None):
|
||||||
|
|
|
@ -30,9 +30,12 @@ from myException.ticketIsExitsException import ticketIsExitsException
|
||||||
from myException.ticketNumOutException import ticketNumOutException
|
from myException.ticketNumOutException import ticketNumOutException
|
||||||
from myUrllib.httpUtils import HTTPClient
|
from myUrllib.httpUtils import HTTPClient
|
||||||
from utils.timeUtil import time_to_minutes, minutes_to_time
|
from utils.timeUtil import time_to_minutes, minutes_to_time
|
||||||
if sys.version_info.major == 2:
|
|
||||||
|
try:
|
||||||
reload(sys)
|
reload(sys)
|
||||||
sys.setdefaultencoding('utf-8')
|
sys.setdefaultencoding('utf-8')
|
||||||
|
except NameError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
class select:
|
class select:
|
||||||
|
|
Loading…
Reference in New Issue