support integer keys in python dicts

rstudio · Feb 14, 2017 · 21f6ba0 · 21f6ba0
1 parent cf6348c
commit 21f6ba0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/R/python.R b/R/python.R
@@ -260,10 +260,16 @@ dict <- function(...) {
   frame <- parent.frame()
   keys <- lapply(names, function(name) {
     if (exists(name, envir = frame, inherits = TRUE))
-      get(name, envir = frame, inherits = TRUE)
-    else
-      name
+      key <- get(name, envir = frame, inherits = TRUE)
+    else {
+      if (grepl("[0-9]+", name))
+        name <- as.integer(name)
+      else
+        name
+    }
   })
+
+
 
   # construct dict
   py_dict(keys, values)

diff --git a/src/python.cpp b/src/python.cpp
@@ -519,8 +519,10 @@ SEXP py_to_r(PyObject* x) {
     // iterate over dict
     PyObject *key, *value;
     Py_ssize_t pos = 0;
-    while (PyDict_Next(x, &pos, &key, &value))
-      list[as_std_string(key)] = py_to_r(value);
+    while (PyDict_Next(x, &pos, &key, &value)) {
+      PyObjectPtr str(PyObject_Str(key));
+      list[as_std_string(str)] = py_to_r(value);
+    }
     return list;
   }