Merge pull request #20 from traff/master

Implement ToPyObject for HashMap->dict conversion.

src/objects/dict.rs

@@ -21,6 +21,9 @@ use python::{Python, ToPythonPointer, PythonObject};
 use conversion::ToPyObject;
 use objects::{PyObject, PyList};
 use err::{self, PyResult, PyErr};
+use std::collections::HashMap;
+use std::hash::Hash;
+use std::cmp::Eq;
 
 /// Represents a Python `dict`.
 pub struct PyDict<'p>(PyObject<'p>);
@@ -112,3 +115,16 @@ impl <'p> PyDict<'p> {
         }
     }
 }
+
+// TODO: use macros to make implementations for different maps
+impl <'p, K, V> ToPyObject<'p> for HashMap<K, V> where K: Hash+Eq+ToPyObject<'p>, V: ToPyObject<'p> {
+    type ObjectType = PyDict<'p>;
+
+    fn to_py_object(&self, py: Python<'p>) -> PyDict<'p> {
+        let dict = PyDict::new(py);
+        for (key, value) in self.iter() {
+            dict.set_item(key, value).unwrap();
+        };
+        dict
+    }
+}

src/objects/mod.rs

@@ -86,7 +86,7 @@ macro_rules! pyobject_newtype(
             fn as_object(&self) -> &::objects::object::PyObject<'p> {
                 &self.0
             }
-            
+
             #[inline]
             fn into_object(self) -> ::objects::object::PyObject<'p> {
                 self.0
@@ -98,7 +98,7 @@ macro_rules! pyobject_newtype(
             unsafe fn unchecked_downcast_from(obj: ::objects::object::PyObject<'p>) -> Self {
                 $name(obj)
             }
-            
+
             /// Unchecked downcast from PyObject to Self.
             /// Undefined behavior if the input object does not have the expected type.
             #[inline]
@@ -114,7 +114,7 @@ macro_rules! pyobject_newtype(
     );
     ($name: ident, $checkfunction: ident) => (
         pyobject_newtype!($name);
-        
+
         impl <'p> ::python::PythonObjectWithCheckedDowncast<'p> for $name<'p> {
             #[inline]
             fn downcast_from(obj : ::objects::object::PyObject<'p>) -> Result<$name<'p>, ::python::PythonObjectDowncastError<'p>> {
@@ -126,7 +126,7 @@ macro_rules! pyobject_newtype(
                     }
                 }
             }
-            
+
             #[inline]
             fn downcast_borrow_from<'a>(obj : &'a ::objects::object::PyObject<'p>) -> Result<&'a $name<'p>, ::python::PythonObjectDowncastError<'p>> {
                 unsafe {
@@ -141,7 +141,7 @@ macro_rules! pyobject_newtype(
     );
     ($name: ident, $checkfunction: ident, $typeobject: ident) => (
         pyobject_newtype!($name, $checkfunction);
-        
+
         impl <'p> ::python::PythonObjectWithTypeObject<'p> for $name<'p> {
             #[inline]
             fn type_object(py: ::python::Python<'p>) -> ::objects::typeobject::PyType<'p> {
@@ -167,3 +167,4 @@ pub mod exc;
 #[cfg(feature="python27-sys")]
 pub mod oldstyle;
 
+mod tests;

src/objects/tests.rs

@@ -0,0 +1,34 @@
+// Copyright (c) 2015 Dmitry Trofimov
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+use {Python, PyDict, ToPyObject, PyInt};
+use std::collections::HashMap;
+
+#[test]
+fn test_hashmap_to_python() {
+    let gil = Python::acquire_gil();
+    let py = gil.python();
+
+    let mut map = HashMap::<i32, i32>::new();
+    map.insert(1, 1);
+
+    let py_map = map.to_py_object(py);
+
+    assert!(py_map.len() == 1);
+    assert!( py_map.get_item(1).unwrap().extract::<i32>().unwrap() == 1);
+}