Make get\set viewport size similar ae in eyes.selenium; Fix pep8

Author: eirenik0

eyes_core/applitools/core/geometry.py

@@ -266,8 +266,11 @@ def is_same(self, other):
         :rtype: bool
         """
         return (
-            self.left == other.left and self.top == other.top and self.width == other.width and self.height ==
-            other.height)
+            self.left == other.left
+            and self.top == other.top
+            and self.width == other.width
+            and self.height == other.height
+        )
 
     def is_same_size(self, other):
         # type: (Region) -> bool

eyes_selenium/applitools/selenium/eyes.py

@@ -43,20 +43,20 @@ class Eyes(EyesBase):
     _DEFAULT_DEVICE_PIXEL_RATIO = 1
 
     @staticmethod
-    def set_viewport_size_static(driver, size):
+    def set_viewport_size(driver, size):
         # type: (AnyWebDriver, ViewPort) -> None
         eyes_selenium_utils.set_viewport_size(driver, size)
 
     @staticmethod
-    def get_viewport_size_static(driver):
+    def get_viewport_size(driver):
         # type: (AnyWebDriver) -> ViewPort
         return eyes_selenium_utils.get_viewport_size(driver)
 
-    def get_viewport_size(self):
-        return self.get_viewport_size_static(self._driver)
+    def _get_viewport_size(self):
+        return self.get_viewport_size(self._driver)
 
-    def set_viewport_size(self, size):
-        self.set_viewport_size_static(self._driver, size)
+    def _set_viewport_size(self, size):
+        self.set_viewport_size(self._driver, size)
 
     def __init__(self, server_url=EyesBase.DEFAULT_EYES_SERVER):
         super(Eyes, self).__init__(server_url)
@@ -208,7 +208,7 @@ def _update_scaling_params(self):
         try:
             scale_provider = ContextBasedScaleProvider(
                 top_level_context_entire_size=self._driver.get_entire_page_size(),
-                viewport_size=self.get_viewport_size(), device_pixel_ratio=device_pixel_ratio,
+                viewport_size=self._get_viewport_size(), device_pixel_ratio=device_pixel_ratio,
                 # always False as in Java version
                 is_mobile_device=False)  # type: ScaleProvider
         except Exception:

eyes_selenium/applitools/selenium/eyes_selenium_utils.py

@@ -189,7 +189,8 @@ def set_browser_size_by_viewport_size(driver, actual_viewport_size, required_siz
     browser_size = get_window_size(driver)
     logger.debug("Current browser size: {}".format(browser_size))
     required_browser_size = dict(width=browser_size['width'] + (required_size['width'] - actual_viewport_size['width']),
-        height=browser_size['height'] + (required_size['height'] - actual_viewport_size['height']))
+                                 height=browser_size['height'] + (
+                                     required_size['height'] - actual_viewport_size['height']))
     return set_browser_size(driver, required_browser_size)
 
 
@@ -245,7 +246,7 @@ def set_viewport_size(driver, required_size):
                 curr_height_change += height_step
 
             required_browser_size = dict(width=browser_size['width'] + curr_width_change,
-                height=browser_size['height'] + curr_height_change)
+                                         height=browser_size['height'] + curr_height_change)
             if required_browser_size == last_required_browser_size:
                 logger.info("Browser size is as required but viewport size does not match!")
                 logger.info("Browser size: {}, Viewport size: {}".format(required_browser_size, actual_viewport_size))
@@ -294,13 +295,13 @@ def is_landscape_orientation(driver):
                 appium_driver.switch_to.context('NATIVE_APP')
             else:
                 original_context = None
-        except WebDriverException as e:
+        except WebDriverException:
             original_context = None
 
         try:
             orieintation = appium_driver.orientation
             return orieintation.lower() == 'landscape'
-        except Exception as e:
+        except Exception:
             logger.debug("WARNING: Couldn't get device orientation. Assuming Portrait.")
         finally:
             if original_context is not None:
@@ -326,7 +327,7 @@ def get_viewport_size_or_display_size(driver):
     try:
         if is_landscape_orientation(driver) and height > width:
             height, width = width, height
-    except WebDriverException as e:
+    except WebDriverException:
         # Not every WebDriver supports querying for orientation.
         pass
     logger.info("Done! Size {:d} x {:d}".format(width, height))