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
--- a/testing/test_junitxml.py
+++ b/testing/test_junitxml.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-
+from __future__ import absolute_import, division, print_function
 from xml.dom import minidom
 import py
 import sys