Make Point and Region accessible as a dict

Author: eirenik0

eyes_core/applitools/core/geometry.py

@@ -14,7 +14,24 @@
 __all__ = ('Point', 'Region',)
 
 
-class Point(object):
+class DictAccessMixin(object):
+    def __getitem__(self, item):
+        if item not in self.__slots__:
+            raise KeyError
+        return getattr(self, item)
+
+
+class StateMixin(object):
+    def __getstate__(self):
+        return OrderedDict([(name, getattr(self, name)) for name in self.__slots__])
+
+    # Required is required in order for jsonpickle to work on this object.
+    # noinspection PyMethodMayBeStatic
+    def __setstate__(self, state):
+        raise EyesError('Cannot create Point instance from dict!')
+
+
+class Point(DictAccessMixin, StateMixin):
     """
     A point with the coordinates (x,y).
     """
@@ -25,15 +42,6 @@ def __init__(self, x=0, y=0):
         self.x = int(round(x))
         self.y = int(round(y))
 
-    def __getstate__(self):
-        return OrderedDict([("x", self.x),
-                            ("y", self.y)])
-
-    # Required is required in order for jsonpickle to work on this object.
-    # noinspection PyMethodMayBeStatic
-    def __setstate__(self, state):
-        raise EyesError('Cannot create Point instance from dict!')
-
     def __add__(self, other):
         return Point(self.x + other.x, self.y + other.y)
 
@@ -165,11 +173,10 @@ def rotate_about(self, p, theta):
         return result
 
     def scale(self, scale_ratio):
-        return Point(int(math.ceil(self.x * scale_ratio)),
-                     int(math.ceil(self.y * scale_ratio)))
+        return Point(int(math.ceil(self.x * scale_ratio)), int(math.ceil(self.y * scale_ratio)))
 
 
-class Region(object):
+class Region(DictAccessMixin, StateMixin):
     """
     A rectangle identified by left,top, width, height.
     """
@@ -183,15 +190,6 @@ def __init__(self, left=0, top=0, width=0, height=0, coordinates_type=Coordinate
         self.height = int(round(height))
         self.coordinates_type = coordinates_type
 
-    def __getstate__(self):
-        return OrderedDict([("top", self.top), ("left", self.left), ("width", self.width),
-                            ("height", self.height), ("coordinatesType", self.coordinates_type)])
-
-    # Required is required in order for jsonpickle to work on this object.
-    # noinspection PyMethodMayBeStatic
-    def __setstate__(self, state):
-        raise EyesError('Cannot create Region instance from dict!')
-
     @classmethod
     def create_empty_region(cls):
         return cls(0, 0, 0, 0)
@@ -267,8 +265,9 @@ def is_same(self, other):
         :return: Whether or not the rectangles have same coordinates.
         :rtype: bool
         """
-        return (self.left == other.left and self.top == other.top and self.width == other.width
-                and self.height == other.height)
+        return (
+            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
@@ -327,8 +326,8 @@ def overlaps(self, other):
         """
         Return true if a rectangle overlaps this rectangle.
         """
-        return ((self.left <= other.left <= self.right or other.left <= self.left <= other.right)
-                and (self.top <= other.top <= self.bottom or other.top <= self.top <= other.bottom))
+        return ((self.left <= other.left <= self.right or other.left <= self.left <= other.right) and (
+            self.top <= other.top <= self.bottom or other.top <= self.top <= other.bottom))
 
     def intersect(self, other):
         # type: (Region) -> None
@@ -366,8 +365,7 @@ def get_sub_regions(self, max_sub_region_size):
                 current_height = current_bottom - current_top
                 current_width = current_right - current_left
 
-                sub_regions.append(Region(current_left, current_top, current_width,
-                                          current_height))
+                sub_regions.append(Region(current_left, current_top, current_width, current_height))
 
                 current_left += max_sub_region_size["width"]
 
@@ -382,17 +380,11 @@ def middle_offset(self):
 
     def offset(self, dx, dy):
         location = self.location.offset(dx, dy)
-        return Region(left=location.x, top=location.y,
-                      width=self.size['width'],
-                      height=self.size['height'])
+        return Region(left=location.x, top=location.y, width=self.size['width'], height=self.size['height'])
 
     def scale(self, scale_ratio):
-        return Region(
-            left=int(math.ceil(self.left * scale_ratio)),
-            top=int(math.ceil(self.top * scale_ratio)),
-            width=int(math.ceil(self.width * scale_ratio)),
-            height=int(math.ceil(self.height * scale_ratio))
-        )
+        return Region(left=int(math.ceil(self.left * scale_ratio)), top=int(math.ceil(self.top * scale_ratio)),
+                      width=int(math.ceil(self.width * scale_ratio)), height=int(math.ceil(self.height * scale_ratio)))
 
     def __str__(self):
         return "(%s, %s) %s x %s" % (self.left, self.top, self.width, self.height)

eyes_selenium/applitools/selenium/capture/eyes_webdriver_screenshot.py

@@ -134,7 +134,7 @@ def get_base64(self):
         return self._screenshot64
 
     def get_location_relative_to_frame_viewport(self, location):
-        result = {'x': location.x, 'y': location.y}
+        result = {'x': location['x'], 'y': location['y']}
         if self._frame_chain or self._is_viewport_screenshot:
             result['x'] -= self._scroll_position.x
             result['y'] -= self._scroll_position.y