Merge pull request #8 from cswegger/tablib

---

This pull request is to fix pickling / unpickling of Row within Dataset. __getstate__ resembled a dictionary comprehension (Python 2.7+) but it wasnt, and it caused wrong values to be pickled, leading to unusable objects after restoring.

This patch fixes the issues. All unit tests still pass.

2 files changed, 15 insertions, 2 deletions

diff --git a/HISTORY.rst b/HISTORY.rst
index f545a4a..22437ca 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,12 @@
 History
 -------
 
+0.9.7
++++++
+
+* Pickling Bugfix
+
+
 0.9.6 (2011-05-12)
 ++++++++++++++++++
 
diff --git a/tablib/core25.py b/tablib/core25.py
index c8352a6..800cae3 100644
--- a/tablib/core25.py
+++ b/tablib/core25.py
@@ -35,7 +35,7 @@ __docformat__ = u'restructuredtext'
 class Row(object):
     u"""Internal Row object. Mainly used for filtering."""
 
-    __slots__ = [u'tuple', u'_row', u'tags']
+    __slots__ = [ u'_row', u'tags']
 
     def __init__(self, row=list(), tags=list()):
         self._row = list(row)
@@ -63,7 +63,14 @@ class Row(object):
         del self._row[i]
 
     def __getstate__(self):
-        return {slot: [getattr(self, slot) for slot in self.__slots__]}
+
+        slots = dict()
+
+        for slot in self.__slots__:
+            attribute = getattr(self, slot)
+            slots[slot] = attribute
+
+        return slots
 
     def __setstate__(self, state):
         for (k, v) in list(state.items()): setattr(self, k, v)