py: add 'keys' and 'values' methods to dict object

Author: kellrott

py/dict.go

@@ -41,6 +41,32 @@ func init() {
 		return NewIterator(o), nil
 	}, 0, "items() -> list of D's (key, value) pairs, as 2-tuples")
 
+	StringDictType.Dict["keys"] = MustNewMethod("keys", func(self Object, args Tuple) (Object, error) {
+		err := UnpackTuple(args, nil, "keys", 0, 0)
+		if err != nil {
+			return nil, err
+		}
+		sMap := self.(StringDict)
+		o := make([]Object, 0, len(sMap))
+		for k := range sMap {
+			o = append(o, String(k))
+		}
+		return NewIterator(o), nil
+	}, 0, "keys() -> list of D's keys, as a list")
+
+	StringDictType.Dict["values"] = MustNewMethod("values", func(self Object, args Tuple) (Object, error) {
+		err := UnpackTuple(args, nil, "values", 0, 0)
+		if err != nil {
+			return nil, err
+		}
+		sMap := self.(StringDict)
+		o := make([]Object, 0, len(sMap))
+		for _, v := range sMap {
+			o = append(o, v)
+		}
+		return NewIterator(o), nil
+	}, 0, "values() -> list of D's values, as a list")
+
 	StringDictType.Dict["get"] = MustNewMethod("get", func(self Object, args Tuple) (Object, error) {
 		var length = len(args)
 		switch {

py/tests/dict.py

@@ -28,6 +28,14 @@
 assert a.get('b',1) == 1
 assert a.get('b',True) == True
 
+doc="check keys"
+a = {"a":1}
+assert list(a.keys()) == ["a"]
+
+doc="check values"
+a = {"a":1}
+assert list(a.values()) == [1]
+
 doc="check items"
 a = {"a":"b","c":5.5}
 for k, v in a.items():