chore: Remove unnecessary else after guard condition (#602)

Summary: Pull Request resolved: #602 Reviewed By: mengxuanzhangz Differential Revision: D49887267 Pulled By: stcheng fbshipit-source-id: 033619e69f7da1ddc4ef9bc5a59a4d879ebee724
facebook · Oct 4, 2023 · a85a1bd · a85a1bd
1 parent 7511fe3
commit a85a1bd
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 27 deletions.
diff --git a/facebook_business/adobjects/helpers/adaccountmixin.py b/facebook_business/adobjects/helpers/adaccountmixin.py
@@ -40,9 +40,7 @@ def get_my_account(cls, api=None):
         me = AdAccountUser(fbid='me', api=api)
 
         # Get first account connected to the user
-        my_account = me.edge_object(cls)
-
-        return my_account
+        return me.edge_object(cls)
 
     def opt_out_user_from_targeting(self,
                                     schema,

diff --git a/facebook_business/adobjects/helpers/adimagemixin.py b/facebook_business/adobjects/helpers/adimagemixin.py
@@ -13,14 +13,12 @@ class AdImageMixin:
     @classmethod
     def remote_create_from_zip(cls, filename, parent_id, api=None):
         api = api or FacebookAdsApi.get_default_api()
-        open_file = open(filename, 'rb')
-        response = api.call(
-            'POST',
-            (parent_id, cls.get_endpoint()),
-            files={filename: open_file},
-        )
-        open_file.close()
-
+        with open(filename, 'rb') as open_file:
+            response = api.call(
+                'POST',
+                (parent_id, cls.get_endpoint()),
+                files={filename: open_file},
+            )
         data = response.json()
 
         objs = []
@@ -73,23 +71,23 @@ def _set_data(self, data):
             }
         """
 
-        if 'images' in data:
-            _, data = data['images'].popitem()
+        if 'images' not in data:
+            return AbstractCrudObject._set_data(self, data)
 
-            for key in map(str, data):
-                self._data[key] = data[key]
+        _, data = data['images'].popitem()
 
-                # clear history due to the update
-                self._changes.pop(key, None)
+        for key in map(str, data):
+            self._data[key] = data[key]
 
-            self._data[self.Field.id] = '%s:%s' % (
-                self.get_parent_id_assured()[4:],
-                self[self.Field.hash],
-            )
+            # clear history due to the update
+            self._changes.pop(key, None)
 
-            return self
-        else:
-            return AbstractCrudObject._set_data(self, data)
+        self._data[self.Field.id] = '%s:%s' % (
+            self.get_parent_id_assured()[4:],
+            self[self.Field.hash],
+        )
+
+        return self
 
     def remote_create(
         self,

diff --git a/facebook_business/adobjects/helpers/reachfrequencypredictionmixin.py b/facebook_business/adobjects/helpers/reachfrequencypredictionmixin.py
@@ -21,7 +21,7 @@ def reserve(
             self.Field.action: self.Action.reserve,
         }
         # Filter out None values.
-        params = dict((k, v) for k, v in params.items() if v is not None)
+        params = {k: v for k, v in params.items() if v is not None}
 
         response = self.get_api_assured().call(
             'POST',

diff --git a/facebook_business/adobjects/serverside/event_request.py b/facebook_business/adobjects/serverside/event_request.py
@@ -282,10 +282,9 @@ def execute(self):
             fields=[],
             params=params,
         )
-        event_response = EventResponse(events_received=response['events_received'],
+        return EventResponse(events_received=response['events_received'],
                                        fbtrace_id=response['fbtrace_id'],
                                        messages=response['messages'])
-        return event_response
 
     def execute_with_client(self, params):
         url = '/'.join([