Skip to content

use Rcpp to convert R Dates to Python #643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevinushey merged 4 commits into from
Nov 19, 2019
Merged

use Rcpp to convert R Dates to Python #643

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d44ed21
use Rcpp to convert R Dates to Python
Nov 13, 2019
58287b1
remove datetime.h and use datetime module instead
Nov 15, 2019
a20d255
handle scalars and vectors
Nov 15, 2019
73a1014
don't wrap in PyObjectPtr
Nov 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
259 changes: 0 additions & 259 deletions src/datetime.h
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions src/python.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ using namespace Rcpp;
#include "event_loop.h"
#include "tinythread.h"

#include "datetime.h"

#include <fstream>
#include <time.h>

Expand Down Expand Up @@ -1704,9 +1702,7 @@ void py_initialize(const std::string& python,

// poll for events while executing python code
event_loop::initialize();

// create static variable PyDateTimeAPI used by macros in datetime.h
PyDateTime_IMPORT;

}

// [[Rcpp::export]]
Expand Down Expand Up @@ -2424,7 +2420,11 @@ PyObjectRef r_convert_dataframe(RObject dataframe, bool convert) {
// [[Rcpp::export]]
PyObjectRef r_convert_date(Date date, bool convert) {

PyObject* py_date = PyDate_FromDate(date.getYear(), date.getMonth(), date.getDay());
PyObject* datetime = PyImport_ImportModule("datetime");
PyObject* py_date = PyObject_CallMethod(
datetime, "date", "iii", date.getYear(), date.getMonth(), date.getDay());

@kevinushey kevinushey Nov 15, 2019 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very pedantic nitpick: you may want to explicit cast date.getYear() and friends to int, e.g.

static_cast<int>(date.getYear())

While the getYear() method does produce an int, in general, when using variadic C functions, it's good practice to cast arguments to ensure they match the type expected / declared in the format string.

The code is correct as is, but I just want to call it out as a kind of best practice.

@skeydan skeydan Nov 15, 2019

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done!

if (py_date == NULL) {
stop(py_fetch_error());
}
return py_ref(py_date, convert);

}