'Refactored by Sourcery'

tnmygrwl · sourcery-ai · Jul 26, 2023 · Jul 26, 2023 · ede96517ad3fc04641cac589d0893b71991995df · sourcery-ai
commit ede96517ad3fc04641cac589d0893b71991995df
diff --git a/doc/apidoc/helper_go_names.py b/doc/apidoc/helper_go_names.py
@@ -25,12 +25,8 @@
 # print(classes_str)
 
 submodules_str = "\n".join(submodules)
-# print(submodules_str)
-
-autosubmodule = ""
-
-for submodule in submodules:
-    autosubmodule += (
-        ".. automodule:: plotly.graph_objects.%s\n    :members:\n\n" % submodule
-    )
+autosubmodule = "".join(
+    (".. automodule:: plotly.graph_objects.%s\n    :members:\n\n" % submodule)
+    for submodule in submodules
+)
 print(autosubmodule)
diff --git a/packages/python/chart-studio/chart_studio/api/utils.py b/packages/python/chart-studio/chart_studio/api/utils.py
@@ -6,9 +6,7 @@
 def _to_native_string(string, encoding):
     if isinstance(string, builtin_str):
         return string
-    if is_py2:
-        return string.encode(encoding)
-    return string.decode(encoding)
+    return string.encode(encoding) if is_py2 else string.decode(encoding)
 
 
 def to_native_utf8_string(string):
@@ -36,6 +34,4 @@ def basic_auth(username, password):
     if isinstance(password, str):
         password = password.encode("latin1")
 
-    return "Basic " + to_native_ascii_string(
-        b64encode(b":".join((username, password))).strip()
-    )
+    return f'Basic {to_native_ascii_string(b64encode(b":".join((username, password))).strip())}'
diff --git a/packages/python/chart-studio/chart_studio/api/v2/utils.py b/packages/python/chart-studio/chart_studio/api/v2/utils.py
@@ -38,17 +38,15 @@ def build_url(resource, id="", route=""):
     # can refer to a 'list' or a 'detail' route. Since it cannot refer to
     # both at the same time, it's overloaded in this function.
     if id:
-        if route:
-            url = "{base}/v2/{resource}/{id}/{route}".format(**formatter)
-        else:
-            url = "{base}/v2/{resource}/{id}".format(**formatter)
+        return (
+            "{base}/v2/{resource}/{id}/{route}".format(**formatter)
+            if route
+            else "{base}/v2/{resource}/{id}".format(**formatter)
+        )
+    elif route:
+        return "{base}/v2/{resource}/{route}".format(**formatter)
     else:
-        if route:
-            url = "{base}/v2/{resource}/{route}".format(**formatter)
-        else:
-            url = "{base}/v2/{resource}".format(**formatter)
-
-    return url
+        return "{base}/v2/{resource}".format(**formatter)
 
 
 def validate_response(response):
@@ -98,7 +96,7 @@ def get_headers():
     creds = config.get_credentials()
 
     headers = {
-        "plotly-client-platform": "python {}".format(version.stable_semver()),
+        "plotly-client-platform": f"python {version.stable_semver()}",
         "content-type": "application/json",
     }
 
@@ -109,9 +107,8 @@ def get_headers():
         headers["authorization"] = proxy_auth
         if creds["username"] and creds["api_key"]:
             headers["plotly-authorization"] = plotly_auth
-    else:
-        if creds["username"] and creds["api_key"]:
-            headers["authorization"] = plotly_auth
+    elif creds["username"] and creds["api_key"]:
+        headers["authorization"] = plotly_auth
 
     return headers
 

diff --git a/packages/python/chart-studio/chart_studio/dashboard_objs/dashboard_objs.py b/packages/python/chart-studio/chart_studio/dashboard_objs/dashboard_objs.py
@@ -29,19 +29,17 @@
 
 
 def _empty_box():
-    empty_box = {"type": "box", "boxType": "empty"}
-    return empty_box
+    return {"type": "box", "boxType": "empty"}
 
 
 def _box(fileId="", shareKey=None, title=""):
-    box = {
+    return {
         "type": "box",
         "boxType": "plot",
         "fileId": fileId,
         "shareKey": shareKey,
         "title": title,
     }
-    return box
 
 
 def _container(box_1=None, box_2=None, size=50, sizeUnit="%", direction="vertical"):
@@ -50,7 +48,7 @@ def _container(box_1=None, box_2=None, size=50, sizeUnit="%", direction="vertica
     if box_2 is None:
         box_2 = _empty_box()
 
-    container = {
+    return {
         "type": "split",
         "size": size,
         "sizeUnit": sizeUnit,
@@ -59,8 +57,6 @@ def _container(box_1=None, box_2=None, size=50, sizeUnit="%", direction="vertica
         "second": box_2,
     }
 
-    return container
-
 
 dashboard_html = """
 <!DOCTYPE HTML>
@@ -295,10 +291,7 @@ def _make_all_nodes_and_paths(self):
         all_nodes = list(node_generator(self["layout"]))
         all_nodes.sort(key=lambda x: x[1])
 
-        # remove path 'second' as it's always an empty box
-        all_paths = []
-        for node in all_nodes:
-            all_paths.append(node[1])
+        all_paths = [node[1] for node in all_nodes]
         path_second = ("second",)
         if path_second in all_paths:
             all_paths.remove(path_second)
@@ -412,10 +405,10 @@ def get_preview(self):
                         fill_percent=fill_percent,
                     )
 
+                    new_top_left_x = top_left_x
+                    new_top_left_y = top_left_y
                     # determine the specs for resulting two box split
                     if is_horizontal:
-                        new_top_left_x = top_left_x
-                        new_top_left_y = top_left_y
                         new_box_w = box_w * (fill_percent / 100.0)
                         new_box_h = box_h
 
@@ -424,8 +417,6 @@ def get_preview(self):
                         new_box_w_2 = box_w * ((100 - fill_percent) / 100.0)
                         new_box_h_2 = box_h
                     else:
-                        new_top_left_x = top_left_x
-                        new_top_left_y = top_left_y
                         new_box_w = box_w
                         new_box_h = box_h * (fill_percent / 100.0)
 

diff --git a/packages/python/chart-studio/chart_studio/grid_objs/grid_objs.py b/packages/python/chart-studio/chart_studio/grid_objs/grid_objs.py
@@ -75,10 +75,7 @@ def __init__(self, data, name):
     def __str__(self):
         max_chars = 10
         jdata = _json.dumps(self.data, cls=utils.PlotlyJSONEncoder)
-        if len(jdata) > max_chars:
-            data_string = jdata[:max_chars] + "...]"
-        else:
-            data_string = jdata
+        data_string = f"{jdata[:max_chars]}...]" if len(jdata) > max_chars else jdata
         string = '<name="{name}", data={data_string}, id={id}>'
         return string.format(name=self.name, data=data_string, id=self.id)
 
@@ -158,15 +155,16 @@ def __init__(self, columns_or_json, fid=None):
         # TODO: verify that columns are actually columns
         pd = get_module("pandas")
         if pd and isinstance(columns_or_json, pd.DataFrame):
-            duplicate_name = utils.get_first_duplicate(columns_or_json.columns)
-            if duplicate_name:
+            if duplicate_name := utils.get_first_duplicate(
+                columns_or_json.columns
+            ):
                 err = exceptions.NON_UNIQUE_COLUMN_MESSAGE.format(duplicate_name)
                 raise exceptions.InputError(err)
 
-            # create columns from dataframe
-            all_columns = []
-            for name in columns_or_json.columns:
-                all_columns.append(Column(columns_or_json[name].tolist(), name))
+            all_columns = [
+                Column(columns_or_json[name].tolist(), name)
+                for name in columns_or_json.columns
+            ]
             self._columns = all_columns
             self.id = ""
 
@@ -197,11 +195,10 @@ def __init__(self, columns_or_json, fid=None):
                             "Each column name of your dictionary must have "
                             "'data', 'order' and 'uid' as keys."
                         )
-            # collect and sort all orders in case orders do not start
-            # at zero or there are jump discontinuities between them
-            all_orders = []
-            for column_name in columns_or_json["cols"].keys():
-                all_orders.append(columns_or_json["cols"][column_name]["order"])
+            all_orders = [
+                columns_or_json["cols"][column_name]["order"]
+                for column_name in columns_or_json["cols"].keys()
+            ]
             all_orders.sort()
 
             # put columns in order in a list
@@ -218,12 +215,11 @@ def __init__(self, columns_or_json, fid=None):
 
             # fill in column_ids
             for column in self:
-                column.id = self.id + ":" + columns_or_json["cols"][column.name]["uid"]
+                column.id = f"{self.id}:" + columns_or_json["cols"][column.name]["uid"]
 
         else:
             column_names = [column.name for column in columns_or_json]
-            duplicate_name = utils.get_first_duplicate(column_names)
-            if duplicate_name:
+            if duplicate_name := utils.get_first_duplicate(column_names):
                 err = exceptions.NON_UNIQUE_COLUMN_MESSAGE.format(duplicate_name)
                 raise exceptions.InputError(err)
 
@@ -283,16 +279,12 @@ def get_column_reference(self, column_name):
         Raises an error if the column name is not in the grid. Otherwise,
         returns the fid:uid pair, which may be the empty string.
         """
-        column_id = None
-        for column in self._columns:
-            if column.name == column_name:
-                column_id = column.id
-                break
-
+        column_id = next(
+            (column.id for column in self._columns if column.name == column_name),
+            None,
+        )
         if column_id is None:
-            col_names = []
-            for column in self._columns:
-                col_names.append(column.name)
+            col_names = [column.name for column in self._columns]
             raise _plotly_utils.exceptions.PlotlyError(
                 "Whoops, that column name doesn't match any of the column "
                 "names in your grid. You must pick from {cols}".format(cols=col_names)

diff --git a/packages/python/chart-studio/chart_studio/plotly/chunked_requests/chunked_request.py b/packages/python/chart-studio/chart_studio/plotly/chunked_requests/chunked_request.py
@@ -132,12 +132,11 @@ def _get_ssl_context(self):
 
         """
 
-        context = None
-
-        if not self._ssl_verification_enabled:
-            context = ssl._create_unverified_context()
-
-        return context
+        return (
+            ssl._create_unverified_context()
+            if not self._ssl_verification_enabled
+            else None
+        )
 
     def _connect(self):
         """ Initialize an HTTP/HTTPS connection with chunked Transfer-Encoding
@@ -158,17 +157,13 @@ def _connect(self):
             else:
                 self._conn = http_client.HTTPConnection(proxy_server, proxy_port)
 
-            tunnel_headers = None
-            if proxy_auth:
-                tunnel_headers = {"Proxy-Authorization": proxy_auth}
-
+            tunnel_headers = {"Proxy-Authorization": proxy_auth} if proxy_auth else None
             self._conn.set_tunnel(server, port, headers=tunnel_headers)
+        elif ssl_enabled:
+            context = self._get_ssl_context()
+            self._conn = http_client.HTTPSConnection(server, port, context=context)
         else:
-            if ssl_enabled:
-                context = self._get_ssl_context()
-                self._conn = http_client.HTTPSConnection(server, port, context=context)
-            else:
-                self._conn = http_client.HTTPConnection(server, port)
+            self._conn = http_client.HTTPConnection(server, port)
 
         self._conn.putrequest("POST", self._url)
         self._conn.putheader("Transfer-Encoding", "chunked")
@@ -276,15 +271,15 @@ def _isconnected(self):
             # Windows machines are the error codes
             # that start with 1
             # (http://msdn.microsoft.com/en-ca/library/windows/desktop/ms740668(v=vs.85).aspx)
-            if e.errno == 35 or e.errno == 10035:
+            if e.errno in [35, 10035]:
                 # This is the "Resource temporarily unavailable" error
                 # which is thrown cuz there was nothing to receive, i.e.
                 # the server hasn't returned a response yet.
                 # This is a non-fatal error and the operation
                 # should be tried again.
                 # So, assume that the connection is still open.
                 return True
-            elif e.errno == 54 or e.errno == 10054:
+            elif e.errno in [54, 10054]:
                 # This is the "Connection reset by peer" error
                 # which is thrown cuz the server reset the
                 # socket, so the connection is closed.
@@ -321,21 +316,19 @@ def _reconnect(self):
             try:
                 self._connect()
             except http_client.socket.error as e:
-                # Attempt to reconnect if the connection was refused
-                if e.errno == 61 or e.errno == 10061:
-                    # errno 61 is the "Connection Refused" error
-                    time.sleep(self._delay)
-                    self._delay += self._delay  # fibonacii delays
-                    self._tries += 1
-                    if self._tries < self.maxtries:
-                        self._reconnect()
-                    else:
-                        self._reset_retries()
-                        raise e
-                else:
+                if e.errno not in [61, 10061]:
                     # Unknown scenario
                     raise e
 
+                # errno 61 is the "Connection Refused" error
+                time.sleep(self._delay)
+                self._delay += self._delay  # fibonacii delays
+                self._tries += 1
+                if self._tries < self.maxtries:
+                    self._reconnect()
+                else:
+                    self._reset_retries()
+                    raise e
         # Reconnect worked - reset _closed
         self._closed = False