Merge remote-tracking branch 'origin/master'

This commit is contained in:
pengtao 2019-11-22 13:47:31 +08:00
commit c6b46993ee

View File

@ -546,7 +546,6 @@ class TapWeeklyReport:
for k in rows: for k in rows:
ttt.append(new_tt.get(k)) ttt.append(new_tt.get(k))
temp["row_data"].append(ttt) temp["row_data"].append(ttt)
pdb.set_trace()
r_data.append(temp) r_data.append(temp)
except Exception: except Exception:
log.error(f"struct data with {line} Failed", exc_info=True) log.error(f"struct data with {line} Failed", exc_info=True)
@ -591,7 +590,6 @@ class TapWeeklyReport:
def run(self): def run(self):
data = self.build() data = self.build()
r_data = self.struct_data(data) r_data = self.struct_data(data)
pdb.set_trace()
print(r_data) print(r_data)
return r_data return r_data