From b00c30cbbf3627d12b5dec2345e1f42d43504799 Mon Sep 17 00:00:00 2001 From: Chaz Littlejohn Date: Tue, 29 Mar 2011 14:18:00 +0000 Subject: [PATCH] Re-did patch to fix import when no hero is defined --- pyfpdb/Database.py | 2 +- pyfpdb/Hand.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index 13496b61..5481d9b9 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -1890,7 +1890,7 @@ class Database: if doinsert: for h in hbulk: id = h.pop() - if (hdata['sc'] != None and hdata['sc']['bk']) and hdata['gsc']['bk']: + if hdata['sc'] and hdata['gsc']: h[4] = hdata['sc'][id]['id'] h[5] = hdata['gsc'][id]['id'] q = self.sql.query['store_hand'] diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index cd00a985..58fb433d 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -306,9 +306,9 @@ dealt whether they were seen in a 'dealt to' line sc = db.prepSessionsCache(self.dbid_hands, self.dbid_pids, self.startTime, sc, self.heros, doinsert) gsc = db.storeSessionsCache(self.dbid_hands, self.dbid_pids, self.startTime, self.gametype ,self.dbid_gt, self.handsplayers, sc, gsc, tz, self.heros, doinsert) - if doinsert: - self.hands['sc'] = sc - self.hands['gsc'] = gsc + if doinsert and sc['bk'] and gsc['bk']: + self.hands['sc'] = sc + self.hands['gsc'] = gsc else: self.hands['sc'] = None self.hands['gsc'] = None