update list and dict to work with loadReduce

pickle/pickle_test.go

@@ -5,8 +5,10 @@
 package pickle
 
 import (
+	"fmt"
 	"github.com/nlpodyssey/gopickle/types"
 	"math/big"
+	"reflect"
 	"strings"
 	"testing"
 )
@@ -637,6 +639,16 @@ func TestByteArrayP5(t *testing.T) {
 	}
 }
 
+func TestFindClass(t *testing.T) {
+	u := &Unpickler{}
+	v, _ := u.findClass("builtins", "list")
+	actual, _ := fmt.Println(reflect.TypeOf(v))
+	expected, _ := fmt.Println(reflect.TypeOf(&types.List{}))
+	if actual != expected {
+		t.Errorf("expected %v, actual: %v", expected, actual)
+	}
+}
+
 // TODO: test BinPersId
 // TODO: test Get
 // TODO: test BinGet

types/dict.go

@@ -80,8 +80,11 @@ func (d *Dict) Keys() []interface{} {
 }
 
 func (*Dict) Call(args ...interface{}) (interface{}, error) {
-	if len(args) != 0 {
-		return args, nil
+	if len(args) == 0 {
+		return NewDict(), nil
 	}
-	return NewDict(), nil
+	if len(args) == 1 {
+		return args[0], nil
+	}
+	return nil, fmt.Errorf("Dict: invalid arguments: %#v", args)
 }

types/dict_test.go

@@ -0,0 +1,16 @@
+package types
+
+import "testing"
+
+func TestDictCall(t *testing.T) {
+	d := NewDict()
+	d.Set("foo", "bar")
+	args := []interface{}{d}
+	result, _ := d.Call(args)
+	resultdict := *result.([]interface{})[0].(*Dict)
+	actual, _ := resultdict.Get("foo")
+	expected := "bar"
+	if actual != expected {
+		t.Errorf("expected %v, actual: %v", expected, actual)
+	}
+}

types/list.go

@@ -4,6 +4,8 @@
 
 package types
 
+import "fmt"
+
 // ListAppender is implemented by any value that exhibits a list-like
 // behaviour, allowing arbitrary values to be appended.
 type ListAppender interface {
@@ -49,8 +51,11 @@ func (l *List) Len() int {
 }
 
 func (*List) Call(args ...interface{}) (interface{}, error) {
-	if len(args) != 0 {
-		return args, nil
+	if len(args) == 0 {
+		return NewList(), nil
+	}
+	if len(args) == 1 {
+		return args[0], nil
 	}
-	return NewList(), nil
+	return nil, fmt.Errorf("List: invalid arguments: %#v", args)
 }

types/list_test.go

@@ -0,0 +1,17 @@
+package types
+
+import (
+	"testing"
+)
+
+func TestCall(t *testing.T) {
+	list := NewList()
+	list.Append("foo")
+	args := []interface{}{list}
+	result, _ := list.Call(args)
+	actual := (*result.([]interface{})[0].(*List))[0]
+	expected := "foo"
+	if actual != expected {
+		t.Errorf("expected %v, actual: %v", expected, actual)
+	}
+}