@@ -147,15 +147,11 @@ def forEdu(cv):
147147 edu_nst .append (e )
148148
149149 cv ["sch_rank_kwd" ] = []
150- if cv ["school_rank_int" ] <= 20 \
151- or ("海外名校" in fea and cv ["school_rank_int" ] <= 200 ):
150+ if cv ["school_rank_int" ] <= 20 or ("海外名校" in fea and cv ["school_rank_int" ] <= 200 ):
152151 cv ["sch_rank_kwd" ].append ("顶尖学校" )
153- elif cv ["school_rank_int" ] <= 50 and cv ["school_rank_int" ] > 20 \
154- or ("海外名校" in fea and cv ["school_rank_int" ] <= 500 and \
155- cv ["school_rank_int" ] > 200 ):
152+ elif 50 >= cv ["school_rank_int" ] > 20 or ("海外名校" in fea and 500 >= cv ["school_rank_int" ] > 200 ):
156153 cv ["sch_rank_kwd" ].append ("精英学校" )
157- elif cv ["school_rank_int" ] > 50 and ("985" in fea or "211" in fea ) \
158- or ("海外名校" in fea and cv ["school_rank_int" ] > 500 ):
154+ elif cv ["school_rank_int" ] > 50 and ("985" in fea or "211" in fea ) or ("海外名校" in fea and cv ["school_rank_int" ] > 500 ):
159155 cv ["sch_rank_kwd" ].append ("优质学校" )
160156 else :
161157 cv ["sch_rank_kwd" ].append ("一般学校" )
@@ -208,8 +204,7 @@ def forEdu(cv):
208204 cv ["tag_kwd" ].append ("好学校" )
209205 cv ["tag_kwd" ].append ("好学历" )
210206 break
211- if (len (cv .get ("degree_kwd" , [])) >= 1 and \
212- "本科" in cv ["degree_kwd" ] and \
207+ if (len (cv .get ("degree_kwd" , [])) >= 1 and "本科" in cv ["degree_kwd" ] and
213208 any ([d .lower () in ["硕士" , "博士" , "mba" , "博士" ] for d in cv .get ("degree_kwd" , [])])) \
214209 or all ([d .lower () in ["硕士" , "博士" , "mba" , "博士后" ] for d in cv .get ("degree_kwd" , [])]) \
215210 or any ([d in ["mba" , "emba" , "博士后" ] for d in cv .get ("degree_kwd" , [])]):
@@ -406,7 +401,7 @@ def forWork(cv):
406401
407402def turnTm2Dt (b ):
408403 if not b :
409- return
404+ return None
410405 b = str (b ).strip ()
411406 if re .match (r"[0-9]{10,}" , b ):
412407 b = time .strftime ("%Y-%m-%d %H:%M:%S" , time .localtime (int (b [:10 ])))
@@ -416,7 +411,7 @@ def turnTm2Dt(b):
416411def getYMD (b ):
417412 y , m , d = "" , "" , "01"
418413 if not b :
419- return ( y , m , d )
414+ return y , m , d
420415 b = turnTm2Dt (b )
421416 if re .match (r"[0-9]{4}" , b ):
422417 y = int (b [:4 ])
@@ -430,7 +425,7 @@ def getYMD(b):
430425 d = "1"
431426 if not m or int (m ) > 12 or int (m ) < 1 :
432427 m = "1"
433- return ( y , m , d )
428+ return y , m , d
434429
435430
436431def birth (cv ):
@@ -480,22 +475,22 @@ def parse(cv):
480475 for k in rmkeys :
481476 del cv [k ]
482477
483- integerity = 0.
478+ integrity = 0.
484479 flds_num = 0.
485480
486481 def hasValues (flds ):
487- nonlocal integerity , flds_num
482+ nonlocal integrity , flds_num
488483 flds_num += len (flds )
489484 for f in flds :
490485 v = str (cv .get (f , "" ))
491486 if len (v ) > 0 and v != '0' and v != '[]' :
492- integerity += 1
487+ integrity += 1
493488
494489 hasValues (tks_fld )
495490 hasValues (small_tks_fld )
496491 hasValues (kwd_fld )
497492 hasValues (num_fld )
498- cv ["integerity_flt" ] = integerity / flds_num
493+ cv ["integerity_flt" ] = integrity / flds_num
499494
500495 if cv .get ("corporation_type" ):
501496 for p , r in [(r"(公司|企业|其它|其他|Others*|\n|未填写|Enterprises|Company|companies)" , "" ),
0 commit comments