Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings

2017-03-20 19:59:05 -03:00
parent 78194093af de8607deb2
commit 9f85584656
77 changed files with 345 additions and 149 deletions
@@ -1,3 +1,4 @@
+from __future__ import absolute_import, division, print_function
 import py, pytest

 import _pytest._code