Merge branch 'master' into wip-color-mc

Conflicts:
	gen/generator.py
	parse/sched.py
	parse_exps.py

1 files changed, 5 insertions, 1 deletions

diff --git a/parse/tuple_table.py b/parse/tuple_table.py
index 47fb6b6..6edc037 100644
--- a/parse/tuple_table.py
+++ b/parse/tuple_table.py
@@ -13,13 +13,17 @@ class TupleTable(object):
     def get_col_map(self):
         return self.col_map
 
+    def __bool__(self):
+        return bool(self.table)
+    __nonzero__ = __bool__
+
     def __getitem__(self, kv):
         key = self.col_map.get_key(kv)
         return self.table[key]
 
     def __setitem__(self, kv, value):
         key = self.col_map.get_key(kv)
-        self.table[key]
+        self.table[key] = value
 
     def __contains__(self, kv):
         key = self.col_map.get_key(kv)