fixup! More SSL cleanups

Author: julien-lang

shotgun_api3/shotgun.py

@@ -2246,9 +2246,9 @@ def reset_user_agent(self):
 
         # create ssl validation string based on settings
         self._user_agents = [
-            f"shotgun-json ({__version__})",
-            f"Python {self.client_caps.py_version} ({ua_platform})",
-            f"ssl {self.client_caps.ssl_version}",
+            "shotgun-json (%s)" % __version__,
+            "Python %s (%s)" % (self.client_caps.py_version, ua_platform),
+            "ssl %s" % (self.client_caps.ssl_version),
         ]
 
     def set_session_uuid(self, session_uuid):

tests/test_api.py

@@ -288,10 +288,6 @@ def test_upload_to_sg(self, mock_send_form):
             "attachments",
             tag_list="monkeys, everywhere, send, help",
         )
-<<<<<<< HEAD
-=======
-
->>>>>>> 413afc6 (SSL)
         mock_send_form.assert_called_once()
         mock_send_form_args, _ = mock_send_form.call_args
         display_name_to_send = mock_send_form_args[1].get("display_name", "")
@@ -315,11 +311,7 @@ def test_upload_to_sg(self, mock_send_form):
             display_name_to_send.startswith("b'") and display_name_to_send.endswith("'")
         )
 
-<<<<<<< HEAD
         mock_send_form.reset_mock()
-=======
-        # mock_send_form.method.assert_called_once() ## CANOT work because was already called earlier....
->>>>>>> 413afc6 (SSL)
         mock_send_form.return_value = "2\nIt can't be upload"
         self.assertRaises(
             shotgun_api3.ShotgunError,
@@ -701,10 +693,6 @@ def test_share_thumbnail_not_ready(self, mock_send_form):
     def test_share_thumbnail_returns_error(self, mock_send_form):
         """throw an exception if server returns an error code"""
 
-<<<<<<< HEAD
-=======
-        # mock_send_form.method.assert_called_once()  # never worked.....
->>>>>>> 413afc6 (SSL)
         mock_send_form.return_value = "1\nerror message.\n"
 
         self.assertRaises(
@@ -2260,7 +2248,7 @@ def my_side_effect2(*args, **kwargs):
         finally:
             self.sg.config.rpc_attempt_interval = bak_rpc_attempt_interval
 
-    @unittest.mock.patch.object(urllib.request.OpenerDirector, 'open')
+    @unittest.mock.patch.object(urllib.request.OpenerDirector, "open")
     def test_sanitized_auth_params(self, mock_open):
         # Simulate the server blowing up and giving us a 500 error
         mock_open.side_effect = urllib.error.HTTPError("url", 500, "message", {}, None)

tests/test_client.py

@@ -29,8 +29,6 @@
 import shotgun_api3.lib.httplib2 as httplib2
 import shotgun_api3 as api
 from shotgun_api3.shotgun import ServerCapabilities, SG_TIMEZONE
-import shotgun_api3 as api
-import shotgun_api3.lib.httplib2 as httplib2
 
 
 def b64encode(val):