Beginning of work on pickling.

Author: chrish42

patsy/eval.py

@@ -565,7 +565,20 @@ def eval(self, memorize_state, data):
                           memorize_state,
                           data)
 
-    __getstate__ = no_pickling
+    def __getstate__(self):
+        return (0, self.name, self.origin)
+
+    def __setstate__(self, state):
+        # TODO What do we do about self.code?
+        (version, code, origin) = state
+        assert version == 0
+        # TODO Give better error message when version is too recent, etc.
+        # Should use a single function from somewhere
+        #
+        self.code = code
+
+def test_EvalFactor_pickle_saves_origin():
+    assert False
 
 def test_EvalFactor_basics():
     e = EvalFactor("a+b")
@@ -577,8 +590,6 @@ def test_EvalFactor_basics():
     assert e.origin is None
     assert e2.origin == "asdf"
 
-    assert_no_pickling(e)
-
 def test_EvalFactor_memorize_passes_needed():
     from patsy.state import stateful_transform
     foo = stateful_transform(lambda: "FOO-OBJ")

patsy/test_highlevel.py

@@ -746,9 +746,13 @@ def test_C_and_pandas_categorical():
                             [1, 0]])
 
 def test_pickle_builder_roundtrips():
+    import numpy as np
+    # TODO Add center(x) and categorical interaction, and call to np.log to patsy formula.
     design_matrix = dmatrix("x + a", {"x": [1, 2, 3],
                                       "a": ["a1", "a2", "a3"]})
+    # TODO Remove builder, pass design_info to dmatrix() instead.
     builder = design_matrix.design_info.builder
+    del np
 
     new_data = {"x": [10, 20, 30],
                 "a": ["a3", "a1", "a2"]}
@@ -758,3 +762,5 @@ def test_pickle_builder_roundtrips():
     m2 = dmatrix(builder2, new_data)
 
     assert np.allclose(m1, m2)
+
+