Skip to content

Conversation

@cpcloud
Copy link
Member

@cpcloud cpcloud commented Mar 19, 2013

See #3097.

@ghost
Copy link

ghost commented Mar 19, 2013

Thanks for investigating this. I think it'd be better to replace the import * statement instead, though.

from cpython cimport (
        PyTypeObject,
        PyFloat_Check,
        PyObject_RichCompareBool,
        PyString_Check
)

seems to do the job.
If you can redo the commit, I'll merge it once travis passes.

@cpcloud
Copy link
Member Author

cpcloud commented Mar 19, 2013

So should I change it then git commit --amend?

@ghost
Copy link

ghost commented Mar 19, 2013

yep. or just add another commit and I'll take care of it.

@cpcloud
Copy link
Member Author

cpcloud commented Mar 19, 2013

Cool. Running the test suite on my machine and then I will push.

ghost pushed a commit that referenced this pull request Mar 20, 2013
BLD: fix time module import conflict
@ghost ghost merged commit 4e0465d into pandas-dev:master Mar 20, 2013
@ghost
Copy link

ghost commented Mar 20, 2013

In it goes. thanks.

@cpcloud cpcloud deleted the time-import-fix branch March 20, 2013 01:14
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant