From fd858fd827af8aeff1c7aba8d5575c83efb7f0bc Mon Sep 17 00:00:00 2001 From: Richard Abrich Date: Sun, 14 May 2023 14:19:06 -0400 Subject: [PATCH] move namedtuples outside class --- atomacos/_converter.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/atomacos/_converter.py b/atomacos/_converter.py index 120064a..1801abe 100644 --- a/atomacos/_converter.py +++ b/atomacos/_converter.py @@ -16,6 +16,12 @@ from CoreFoundation import CFArrayGetTypeID, CFGetTypeID, CFStringGetTypeID +CGRect = namedtuple("CGRect", ["x", "y", "width", "height"]) +CFRange = namedtuple("CFRange", ["location", "length"]) +CGPoint = namedtuple("CGPoint", ["x", "y"]) +CGSize = namedtuple("CGSize", ["width", "height"]) + + class Converter: def __init__(self, axuielementclass=None): self.app_ref_class = axuielementclass @@ -49,28 +55,24 @@ def convert_app_ref(self, value): def convert_size(self, value): repr_searched = re.search("{.*}", str(value)).group() - CGSize = namedtuple("CGSize", ["width", "height"]) size = NSSizeFromString(repr_searched) return CGSize(size.width, size.height) def convert_point(self, value): repr_searched = re.search("{.*}", str(value)).group() - CGPoint = namedtuple("CGPoint", ["x", "y"]) point = NSPointFromString(repr_searched) return CGPoint(point.x, point.y) def convert_range(self, value): repr_searched = re.search("{.*}", str(value)).group() - CFRange = namedtuple("CFRange", ["location", "length"]) range = NSRangeFromString(repr_searched) return CFRange(range.location, range.length) def convert_rect(self, value): repr_searched = re.search("{.*}", str(value)).group() - CGRect = namedtuple("CGRect", ["x", "y", "width", "height"]) rect = NSRectFromString(repr_searched) return CGRect(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height)