search

mahmoudimus / nose-timer

A timer plugin for nosetests (how much time does every test take?)
MIT License
126 stars 33 forks source link

Fix python 3 issue #21

Closed jsalvatier closed 10 years ago

mahmoudimus commented 10 years ago

Sweet, @jsalvatier - I'll merge this in if you can fix the merge conflict?

jsalvatier commented 10 years ago

You should accept @e0ne's PR first I think.

jsalvatier commented 10 years ago

I mean that I don't think there's a merge conflict, I just based my branch off @e0ne's because I wanted the tests. If you accept that PR, this one should just be one commit.

e0ne commented 10 years ago

Hi @jsalvatier, I merged my pull request. Please, rebase your to the latest master