Merge pull request #3859 from asottile/pyupgrade_1_4

Some pyupgrade 1.4.x changes

testing/code/test_excinfo.py

@@ -270,7 +270,7 @@ class TestTraceback_f_g_h(object):
         decorator = pytest.importorskip("decorator").decorator
 
         def log(f, *k, **kw):
-            print("%s %s" % (k, kw))
+            print("{} {}".format(k, kw))
             f(*k, **kw)
 
         log = decorator(log)