black format

Author: eduardoChaucaGallegos

shotgun_api3/shotgun.py

@@ -31,6 +31,8 @@
 
 import base64
 import copy
+import io
+import http.cookiejar  # used for attachment upload
 import datetime
 import json
 import logging
@@ -45,8 +47,6 @@
 import uuid  # used for attachment upload
 
 # Python 2/3 compatibility
-from .lib import six
-from .lib import sgsix
 from .lib import sgutils
 from io import BytesIO # used for attachment upload
 
@@ -672,9 +672,15 @@ def __init__(
         # the lowercase version of the credentials.
         auth, self.config.server = self._split_url(base_url)
         if auth:
+<<<<<<< HEAD
             auth = base64.encodebytes(
                 sgutils.ensure_binary(urllib.parse.unquote(auth))
             ).decode("utf-8")
+=======
+            auth = base64encode(urllib.parse.unquote(auth).encode("utf-8")).decode(
+                "utf-8"
+            )
+>>>>>>> f64d7ea (black format)
             self.config.authorization = "Basic " + auth.strip()
 
         # foo:[email protected]:3456
@@ -2221,8 +2227,7 @@ def schema_field_update(
             "type": entity_type,
             "field_name": field_name,
             "properties": [
-                {"property_name": k, "value": v}
-                for k, v in (properties or {}).items()
+                {"property_name": k, "value": v} for k, v in (properties or {}).items()
             ],
         }
         params = self._add_project_param(params, project_entity)
@@ -4556,7 +4561,9 @@ def encode(self, params, files, boundary=None, buffer=None):
             key = key.decode("utf-8") if isinstance(key, bytes) else str(key)
 
             buffer.write(("--%s\r\n" % boundary).encode("utf-8"))
-            buffer.write(('Content-Disposition: form-data; name="%s"' % key).encode("utf-8"))
+            buffer.write(
+                ('Content-Disposition: form-data; name="%s"' % key).encode("utf-8")
+            )
             buffer.write(("\r\n\r\n%s\r\n" % value).encode("utf-8"))
         for key, fd in files:
             # On Windows, it's possible that we were forced to open a file
@@ -4565,7 +4572,11 @@ def encode(self, params, files, boundary=None, buffer=None):
             # If we don't, the mix of unicode and strings going into the
             # buffer can cause UnicodeEncodeErrors to be raised.
             filename = fd.name
-            filename = filename.decode("utf-8") if isinstance(filename, bytes) else str(filename)
+            filename = (
+                filename.decode("utf-8")
+                if isinstance(filename, bytes)
+                else str(filename)
+            )
             filename = filename.split("/")[-1]
             key = key.decode("utf-8") if isinstance(key, bytes) else str(key)
             content_type = mimetypes.guess_type(filename)[0]

tests/test_api.py

@@ -239,9 +239,7 @@ def test_upload_download(self):
 
         # test upload of non-ascii, unicode path
         u_path = os.path.abspath(
-            os.path.expanduser(
-                glob.glob(os.path.join(str(this_dir), "Noëlご.jpg"))[0]
-            )
+            os.path.expanduser(glob.glob(os.path.join(str(this_dir), "Noëlご.jpg"))[0])
         )
 
         # If this is a problem, it'll raise with a UnicodeEncodeError. We
@@ -281,9 +279,7 @@ def test_upload_to_sg(self, mock_send_form):
         mock_send_form.return_value = "1\n:123\nasd"
         this_dir, _ = os.path.split(__file__)
         u_path = os.path.abspath(
-            os.path.expanduser(
-                glob.glob(os.path.join(str(this_dir), "Noëlご.jpg"))[0]
-            )
+            os.path.expanduser(glob.glob(os.path.join(str(this_dir), "Noëlご.jpg"))[0])
         )
         upload_id = self.sg.upload(
             "Version",

tests/test_client.py

@@ -640,9 +640,7 @@ def test_encode_payload(self):
         self.assertTrue(isinstance(j, bytes))
 
     def test_decode_response_ascii(self):
-        self._assert_decode_resonse(
-            True, str("my data \u00e0")
-        )
+        self._assert_decode_resonse(True, str("my data \u00e0"))
 
     def test_decode_response_unicode(self):
         self._assert_decode_resonse(False, "my data \u00e0")