Merge branch 'v0.12.x' of https://github.com/PythonCharmers/python-future into v0.12.x

Author: edschofield

future/tests/base.py

@@ -308,14 +308,7 @@ def _run_test_script(self, filename='mytestscript.py',
 def expectedFailurePY3(func):
     if not PY3:
         return func
-    @functools.wraps(func)
-    def wrapper(*args, **kwargs):
-        try:
-            func(*args, **kwargs)
-        except Exception:
-            raise unittest.case._ExpectedFailure(sys.exc_info())
-        raise unittest.case._UnexpectedSuccess
-    return wrapper
+    return unittest.expectedFailure(func)
 
 
 def expectedFailurePY26(func):