fixed conversion of js dates to python datetimes

Matt Walters · Matt Walters · commit 71d28719c5f8 · 2014-09-08T14:13:19.000-04:00
diff --git a/src/binding.cc b/src/binding.cc
@@ -1,6 +1,6 @@
 #include <node.h>
 #include <Python.h>
-
+#include <datetime.h>
 #include "py_object_wrapper.h"
 #include "utils.h"
 
@@ -52,7 +52,6 @@ Handle<Value> import(const Arguments& args) {
     module = PyImport_Import(module_name);    
 
     if (PyErr_Occurred()) {
-
         return ThrowPythonException();
     }
 
@@ -66,8 +65,8 @@ Handle<Value> import(const Arguments& args) {
 
 void init (Handle<Object> exports) {
     HandleScope scope;
-    Py_Initialize();
 
+    Py_Initialize();
     PyObjectWrapper::Initialize();
 
     // how to schedule Py_Finalize(); to be called when process exits?
@@ -98,4 +97,4 @@ void init (Handle<Object> exports) {
 
 }
 
-NODE_MODULE(binding, init)
+NODE_MODULE(binding, init)
diff --git a/src/py_object_wrapper.cc b/src/py_object_wrapper.cc
@@ -1,11 +1,15 @@
 #include <node.h>
 #include "py_object_wrapper.h"
 #include "utils.h"
+#include "datetime.h"
 
 Persistent<FunctionTemplate> PyObjectWrapper::py_function_template;
 
 void PyObjectWrapper::Initialize() {
     HandleScope scope;
+
+    PyDateTime_IMPORT;
+
     Local<FunctionTemplate> fn_tpl = FunctionTemplate::New();
     Local<ObjectTemplate> proto = fn_tpl->PrototypeTemplate();
     Local<ObjectTemplate> obj_tpl = fn_tpl->InstanceTemplate();
@@ -176,6 +180,7 @@ Handle<Value> PyObjectWrapper::ValueOf(const Arguments& args) {
 PyObject* PyObjectWrapper::ConvertToPython(const Handle<Value>& value) {
     int len;
     HandleScope scope;
+
     if(value->IsString()) {
         return PyString_FromString(*String::Utf8Value(value->ToString()));
     } else if (value->IsBoolean()) {
@@ -186,6 +191,14 @@ PyObject* PyObjectWrapper::ConvertToPython(const Handle<Value>& value) {
     	}
 	} else if(value->IsNumber()) {
         return PyFloat_FromDouble(value->NumberValue());
+    } else if(value->IsDate()) {
+    	Handle<Date> date = Handle<Date>::Cast(value);
+        PyObject* floatObj = PyFloat_FromDouble(date->NumberValue() / 1000.0 ); // javascript returns milliseconds since epoch. python wants seconds since epoch
+    	PyObject* timeTuple = Py_BuildValue("(O)", floatObj);
+        Py_DECREF(floatObj);
+        PyObject* dateTime = PyDateTime_FromTimestamp(timeTuple);
+        Py_DECREF(timeTuple);
+        return dateTime;
     } else if(value->IsObject()) {
     	if(value->IsArray()) {
 			Local<Array> array = Array::Cast(*value);
@@ -221,7 +234,6 @@ PyObject* PyObjectWrapper::ConvertToPython(const Handle<Value>& value) {
 				return py_dict;
 			}
 		}
-
         return NULL;
     } else if(value->IsArray()) {
 		Local<Array> array = Array::Cast(*value);
diff --git a/test/index.js b/test/index.js
@@ -30,4 +30,59 @@ describe('node-python', function () {
     }).throw(/Python Error: SyntaxError/)
     });
   });
-});
+  it('should convert javascript booleans to python booleans', function () {
+    test = python.import('test2');
+    var type = test.getPythonTypeName(true);
+    type.should.equal('bool');
+  });
+  it('should convert javascript date to python date', function () {
+    test = python.import('test2');
+    var type = test.getPythonTypeName(new Date());
+    type.should.equal('datetime');
+  });
+  it('should convert javascript numbers to python floats', function () {
+    test = python.import('test2');
+    var type = test.getPythonTypeName(1);
+    type.should.equal('float');
+  });
+  it('should convert javascript arrays to python list', function () {
+    test = python.import('test2');
+    var type = test.getPythonTypeName([]);
+    type.should.equal('list');
+  });
+  it('should convert javascript objects to python dictionaries', function () {
+    test = python.import('test2');
+    var type = test.getPythonTypeName({});
+    type.should.equal('dict');
+  });
+  it('should convert javascript nested objects correctly', function () {
+    test = python.import('test2');
+    var type = test.getPythonTypeName2({
+      value: 1
+    }, 'value');
+    type.should.equal('float');
+    var type = test.getPythonTypeName2({
+      value: true
+    }, 'value');
+    type.should.equal('bool');
+    var type = test.getPythonTypeName2({
+      value: new Date()
+    }, 'value');
+    type.should.equal('datetime');
+    var type = test.getPythonTypeName2({
+      value: {}
+    }, 'value');
+    type.should.equal('dict');
+    var type = test.getPythonTypeName2({
+      value: ['one', 'two', 'three']
+    }, 'value');
+    type.should.equal('list');
+    var i = 0, arr = [];
+    while (i < 10000) {
+      arr.push(Math.random().toString())
+      i++;
+    }
+    var type = test.getPythonTypeName(arr);
+    type.should.equal('list');
+  });
+});
diff --git a/test/support/test.py b/test/support/test.py
@@ -4,4 +4,4 @@ def good(self):
 
 class Bad():
     def bad(self):
-        should cause parse error
+        should cause parse error
diff --git a/test/support/test2.py b/test/support/test2.py
@@ -0,0 +1,7 @@
+def getPythonTypeName(value):
+  return type(value).__name__
+def getPythonTypeName2(value, index):
+  item = value[index]
+  return type(item).__name__
+def getPythonValue(value):
+  return value
diff --git a/test/support/test2.pyc b/test/support/test2.pyc
