aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2013-04-29 16:58:52 -0400
committerJonathan Herman <hermanjl@cs.unc.edu>2013-04-29 16:58:52 -0400
commit648d6381cac8376b5217f915eb49e3aea232df26 (patch)
tree5458e1855c0ad09d3ab3769ce3c3a47dbfa5c13d
parent7e32c3915e7ea27d2533d99a22fa53ef923198f5 (diff)
Minor bug fixes for tuple_table/col_map.
-rw-r--r--parse/col_map.py4
-rw-r--r--parse/tuple_table.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/parse/col_map.py b/parse/col_map.py
index 15e1d64..ccce865 100644
--- a/parse/col_map.py
+++ b/parse/col_map.py
@@ -19,7 +19,7 @@ class ColMapBuilder(object):
19 19
20class ColMap(object): 20class ColMap(object):
21 def __init__(self, col_list, values = None): 21 def __init__(self, col_list, values = None):
22 self.col_list = col_list 22 self.col_list = sorted(col_list)
23 self.rev_map = {} 23 self.rev_map = {}
24 self.values = values 24 self.values = values
25 25
@@ -47,7 +47,7 @@ class ColMap(object):
47 if col not in kv: 47 if col not in kv:
48 key += (None,) 48 key += (None,)
49 else: 49 else:
50 key += (kv[col],) 50 key += (str(kv[col]),)
51 51
52 return key 52 return key
53 53
diff --git a/parse/tuple_table.py b/parse/tuple_table.py
index 320d9dd..6edc037 100644
--- a/parse/tuple_table.py
+++ b/parse/tuple_table.py
@@ -23,7 +23,7 @@ class TupleTable(object):
23 23
24 def __setitem__(self, kv, value): 24 def __setitem__(self, kv, value):
25 key = self.col_map.get_key(kv) 25 key = self.col_map.get_key(kv)
26 self.table[key] 26 self.table[key] = value
27 27
28 def __contains__(self, kv): 28 def __contains__(self, kv):
29 key = self.col_map.get_key(kv) 29 key = self.col_map.get_key(kv)