Upgrade Python syntax with pyupgrade

tests/integration/test_proxy.py

@@ -44,7 +44,7 @@ def proxy_server():
         target=httpd.serve_forever,
     )
     proxy_process.start()
-    yield 'http://{0}:{1}'.format(*httpd.server_address)
+    yield 'http://{}:{}'.format(*httpd.server_address)
     proxy_process.terminate()
 
 

vcr/migration.py

@@ -68,7 +68,7 @@ def _migrate(data):
     for item in data:
         req = item['request']
         res = item['response']
-        uri = dict((k, req.pop(k)) for k in PARTS)
+        uri = {k: req.pop(k) for k in PARTS}
         req['uri'] = build_uri(**uri)
         # convert headers to dict of lists
         headers = req['headers']
@@ -100,7 +100,7 @@ def migrate_json(in_fp, out_fp):
 
 
 def _list_of_tuples_to_dict(fs):
-    return dict((k, v) for k, v in fs[0])
+    return {k: v for k, v in fs[0]}
 
 
 def _already_migrated(data):

vcr/request.py

@@ -91,7 +91,7 @@ class Request(object):
             'method': self.method,
             'uri': self.uri,
             'body': self.body,
-            'headers': dict(((k, [v]) for k, v in self.headers.items())),
+            'headers': {k: [v] for k, v in self.headers.items()},
         }
 
     @classmethod

vcr/stubs/__init__.py

@@ -139,7 +139,7 @@ class VCRConnection(object):
         if url and not url.startswith('/'):
             # Then this must be a proxy request.
             return url
-        uri = "{0}://{1}{2}{3}".format(
+        uri = "{}://{}{}{}".format(
             self._protocol,
             self.real_connection.host,
             self._port_postfix(),

vcr/util.py

@@ -118,10 +118,10 @@ def auto_decorate(
             )
 
         def __new__(cls, name, bases, attributes_dict):
-            new_attributes_dict = dict(
-                (attribute, maybe_decorate(attribute, value))
+            new_attributes_dict = {
+                attribute: maybe_decorate(attribute, value)
                 for attribute, value in attributes_dict.items()
-            )
+            }
             return super(DecorateAll, cls).__new__(
                 cls, name, bases, new_attributes_dict
             )