Upgrade Python syntax with pyupgrade https://github.com/asottile/pyupgrade

hugovk · hugovk · commit 5a0b5746fbd4 · 2018-10-01T22:58:29.000+03:00
diff --git a/examples/live_sendgrid_example.py b/examples/live_sendgrid_example.py
@@ -5,7 +5,7 @@
 host = "https://api.sendgrid.com"
 api_key = os.environ.get('SENDGRID_API_KEY')
 request_headers = {
-    "Authorization": 'Bearer {0}'.format(api_key)
+    "Authorization": 'Bearer {}'.format(api_key)
 }
 version = 3  # we could also use client.version(3)
 client = python_http_client.Client(host=host,
diff --git a/python_http_client/client.py b/python_http_client/client.py
@@ -102,7 +102,7 @@ def _build_versioned_url(self, url):
         :type url: string
         :return: string
         """
-        return '{0}/v{1}{2}'.format(self.host, str(self._version), url)
+        return '{}/v{}{}'.format(self.host, str(self._version), url)
 
     def _build_url(self, query_params):
         """Build the final URL to be passed to urllib
@@ -114,7 +114,7 @@ def _build_url(self, query_params):
         url = ''
         count = 0
         while count < len(self._url_path):
-            url += '/{0}'.format(self._url_path[count])
+            url += '/{}'.format(self._url_path[count])
             count += 1
 
         # add slash
@@ -123,7 +123,7 @@ def _build_url(self, query_params):
 
         if query_params:
             url_values = urlencode(sorted(query_params.items()), True)
-            url = '{0}?{1}'.format(url, url_values)
+            url = '{}?{}'.format(url, url_values)
 
         if self._version:
             url = self._build_versioned_url(url)
diff --git a/setup.py b/setup.py
@@ -14,8 +14,8 @@
     version=version,
     author='Elmer Thomas',
     author_email='dx@sendgrid.com',
-    url='{0}python-http-client'.format(base_url),
-    download_url='{0}python-http-client/tarball/{1}'.format(base_url, version),
+    url='{}python-http-client'.format(base_url),
+    download_url='{}python-http-client/tarball/{}'.format(base_url, version),
     packages=['python_http_client'],
     license='MIT',
     description='HTTP REST client, simplified for Python',
diff --git a/tests/profile.py b/tests/profile.py
@@ -131,13 +131,13 @@ def run_tested_code(client, num_loops):
 
 @timefunc
 def dynamic_version():
-    local_path = '{0}/..'.format(os.path.abspath(os.path.dirname(__file__)))
+    local_path = '{}/..'.format(os.path.abspath(os.path.dirname(__file__)))
     Config(local_path)
     api_key = os.environ.get('SENDGRID_API_KEY')
     request_headers = {
         'X-Mock': 200,
         'Content-Type': 'application/json',
-        'Authorization': 'Bearer {0}'.format(api_key)
+        'Authorization': 'Bearer {}'.format(api_key)
     }
     client = Client(host=os.environ.get('LOCAL_HOST'),
                     request_headers=request_headers,
@@ -147,13 +147,13 @@ def dynamic_version():
 
 @timefunc
 def static_version():
-    local_path = '{0}/..'.format(os.path.abspath(os.path.dirname(__file__)))
+    local_path = '{}/..'.format(os.path.abspath(os.path.dirname(__file__)))
     Config(local_path)
     api_key = os.environ.get('SENDGRID_API_KEY')
     request_headers = {
         'X-Mock': 200,
         'Content-Type': 'application/json',
-        'Authorization': 'Bearer {0}'.format(api_key)
+        'Authorization': 'Bearer {}'.format(api_key)
     }
     client = StaticClient(host=os.environ.get('LOCAL_HOST'),
                           request_headers=request_headers,
diff --git a/tests/test_unit.py b/tests/test_unit.py
@@ -103,15 +103,15 @@ def test__init__(self):
     def test__build_versioned_url(self):
         url = '/api_keys?hello=1&world=2'
         versioned_url = self.client._build_versioned_url(url)
-        url = '{0}/v{1}{2}'.format(self.host, str(self.client._version), url)
+        url = '{}/v{}{}'.format(self.host, str(self.client._version), url)
         self.assertEqual(versioned_url, url)
 
     def test__build_url(self):
         self.client._url_path = self.client._url_path + ['here']
         self.client._url_path = self.client._url_path + ['there']
         self.client._url_path = self.client._url_path + [1]
         self.client._version = 3
-        url = '{0}/v{1}{2}'.format(
+        url = '{}/v{}{}'.format(
             self.host,
             str(self.client._version),
             '/here/there/1?hello=0&world=1&ztest=0&ztest=1'

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`host = "https://api.sendgrid.com"`
`6`	`6`	`api_key = os.environ.get('SENDGRID_API_KEY')`
`7`	`7`	`request_headers = {`
`8`		`- "Authorization": 'Bearer {0}'.format(api_key)`
	`8`	`+ "Authorization": 'Bearer {}'.format(api_key)`
`9`	`9`	`}`
`10`	`10`	`version = 3 # we could also use client.version(3)`
`11`	`11`	`client = python_http_client.Client(host=host,`