androidviewclient 23.4.0__tar.gz → 24.0.0__tar.gz

{androidviewclient-23.4.0/src/androidviewclient.egg-info → androidviewclient-24.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: androidviewclient
-Version: 23.4.0
+Version: 24.0.0
 Summary: AndroidViewClient is a 100% pure python library and tools
 Home-page: https://github.com/dtmilano/AndroidViewClient/
 Author: Diego Torres Milano

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='androidviewclient',
-      version='23.4.0',
+      version='24.0.0',
       description='''AndroidViewClient is a 100% pure python library and tools
         that simplifies test script creation providing higher level
         operations and the ability of obtaining the tree of Views present at

{androidviewclient-23.4.0 → androidviewclient-24.0.0/src/androidviewclient.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: androidviewclient
-Version: 23.4.0
+Version: 24.0.0
 Summary: AndroidViewClient is a 100% pure python library and tools
 Home-page: https://github.com/dtmilano/AndroidViewClient/
 Author: Diego Torres Milano

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/src/com/dtmilano/android/adb/adbclient.py

@@ -27,7 +27,7 @@ from typing import Optional
 
 from com.dtmilano.android.adb.dumpsys import Dumpsys
 
-__version__ = '23.4.0'
+__version__ = '24.0.0'
 
 import sys
 import warnings
@@ -614,7 +614,7 @@ class AdbClient:
     def getRestrictedScreen(self):
         ''' Gets C{mRestrictedScreen} values from dumpsys. This is a method to obtain display dimensions '''
 
-        rsRE = re.compile('\s*mRestrictedScreen=\((?P<x>\d+),(?P<y>\d+)\) (?P<w>\d+)x(?P<h>\d+)')
+        rsRE = re.compile(r'\s*mRestrictedScreen=\((?P<x>\d+),(?P<y>\d+)\) (?P<w>\d+)x(?P<h>\d+)')
         for line in self.shell('dumpsys window').splitlines():
             m = rsRE.match(line)
             if m:
@@ -670,7 +670,7 @@ class AdbClient:
         ''' Gets C{mPhysicalDisplayInfo} values from dumpsys. This is a method to obtain display dimensions and density'''
 
         self.__checkTransport()
-        phyDispRE = re.compile('Physical size: (?P<width>\d+)x(?P<height>\d+).*Physical density: (?P<density>\d+)',
+        phyDispRE = re.compile(r'Physical size: (?P<width>\d+)x(?P<height>\d+).*Physical density: (?P<density>\d+)',
                                re.DOTALL)
         m = phyDispRE.search(self.shell('wm size; wm density'))
         if m:
@@ -682,7 +682,7 @@ class AdbClient:
             return displayInfo
 
         phyDispRE = re.compile(
-            '.*PhysicalDisplayInfo{(?P<width>\d+) x (?P<height>\d+), .*, density (?P<density>[\d.]+).*')
+            r'.*PhysicalDisplayInfo{(?P<width>\d+) x (?P<height>\d+), .*, density (?P<density>[\d.]+).*')
         for line in self.shell('dumpsys display').splitlines():
             m = phyDispRE.search(line, 0)
             if m:
@@ -695,9 +695,9 @@ class AdbClient:
                 return displayInfo
 
         # This could also be mSystem or mOverscanScreen
-        phyDispRE = re.compile('\s*mUnrestrictedScreen=\((?P<x>\d+),(?P<y>\d+)\) (?P<width>\d+)x(?P<height>\d+)')
+        phyDispRE = re.compile(r'\s*mUnrestrictedScreen=\((?P<x>\d+),(?P<y>\d+)\) (?P<width>\d+)x(?P<height>\d+)')
         # This is known to work on older versions (i.e. API 10) where mrestrictedScreen is not available
-        dispWHRE = re.compile('\s*DisplayWidth=(?P<width>\d+) *DisplayHeight=(?P<height>\d+)')
+        dispWHRE = re.compile(r'\s*DisplayWidth=(?P<width>\d+) *DisplayHeight=(?P<height>\d+)')
         for line in self.shell('dumpsys window').splitlines():
             m = phyDispRE.search(line, 0)
             if not m:
@@ -743,7 +743,7 @@ class AdbClient:
             return displayInfo['orientation']
         # Fallback method to obtain the orientation
         # See https://github.com/dtmilano/AndroidViewClient/issues/128
-        surfaceOrientationRE = re.compile('SurfaceOrientation:\s+(\d+)')
+        surfaceOrientationRE = re.compile(r'SurfaceOrientation:\s+(\d+)')
         output = self.shell('dumpsys input')
         m = surfaceOrientationRE.search(output)
         if m:
@@ -1338,21 +1338,21 @@ class AdbClient:
         dww = self.shell('dumpsys window windows')
         if DEBUG_WINDOWS: print(dww, file=sys.stderr)
         lines = dww.splitlines()
-        widRE = re.compile('^ *Window #%s Window\{%s (u\d+ )?%s?.*\}:' %
+        widRE = re.compile(r'^ *Window #%s Window\{%s (u\d+ )?%s?.*\}:' %
                            (_nd('num'), _nh('winId'), _ns('activity', greedy=True)))
-        currentFocusRE = re.compile('^  mCurrentFocus=Window\{%s .*' % _nh('winId'))
+        currentFocusRE = re.compile(r'^  mCurrentFocus=Window\{%s .*' % _nh('winId'))
         viewVisibilityRE = re.compile(' mViewVisibility=0x%s ' % _nh('visibility'))
         # This is for 4.0.4 API-15
-        containingFrameRE = re.compile('^   *mContainingFrame=\[%s,%s\]\[%s,%s\] mParentFrame=\[%s,%s\]\[%s,%s\]' %
+        containingFrameRE = re.compile(r'^   *mContainingFrame=\[%s,%s\]\[%s,%s\] mParentFrame=\[%s,%s\]\[%s,%s\]' %
                                        (_nd('cx'), _nd('cy'), _nd('cw'), _nd('ch'), _nd('px'), _nd('py'), _nd('pw'),
                                         _nd('ph')))
-        contentFrameRE = re.compile('^   *mContentFrame=\[%s,%s\]\[%s,%s\] mVisibleFrame=\[%s,%s\]\[%s,%s\]' %
+        contentFrameRE = re.compile(r'^   *mContentFrame=\[%s,%s\]\[%s,%s\] mVisibleFrame=\[%s,%s\]\[%s,%s\]' %
                                     (_nd('x'), _nd('y'), _nd('w'), _nd('h'), _nd('vx'), _nd('vy'), _nd('vx1'),
                                      _nd('vy1')))
         # This is for 4.1 API-16
-        framesRE = re.compile('^   *Frames: containing=\[%s,%s\]\[%s,%s\] parent=\[%s,%s\]\[%s,%s\]' %
+        framesRE = re.compile(r'^   *Frames: containing=\[%s,%s\]\[%s,%s\] parent=\[%s,%s\]\[%s,%s\]' %
                               (_nd('cx'), _nd('cy'), _nd('cw'), _nd('ch'), _nd('px'), _nd('py'), _nd('pw'), _nd('ph')))
-        contentRE = re.compile('^     *content=\[%s,%s\]\[%s,%s\] visible=\[%s,%s\]\[%s,%s\]' %
+        contentRE = re.compile(r'^     *content=\[%s,%s\]\[%s,%s\] visible=\[%s,%s\]\[%s,%s\]' %
                                (_nd('x'), _nd('y'), _nd('w'), _nd('h'), _nd('vx'), _nd('vy'), _nd('vx1'), _nd('vy1')))
         policyVisibilityRE = re.compile('mPolicyVisibility=%s ' % _ns('policyVisibility', greedy=True))
 
@@ -1463,7 +1463,7 @@ class AdbClient:
 
     def getTopActivityNameAndPid(self):
         dat = self.shell('dumpsys activity top')
-        activityRE = re.compile('\s*ACTIVITY ([A-Za-z0-9_.]+)/([A-Za-z0-9_.\$]+) \w+ pid=(\d+)')
+        activityRE = re.compile(r'\s*ACTIVITY ([A-Za-z0-9_.]+)/([A-Za-z0-9_.\$]+) \w+ pid=(\d+)')
         m = activityRE.findall(dat)
         if len(m) > 0:
             return m[-1]

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/src/com/dtmilano/android/adb/dumpsys.py

@@ -23,7 +23,7 @@ import re
 import sys
 from _warnings import warn
 
-__version__ = '23.4.0'
+__version__ = '24.0.0'
 
 DEBUG = False
 

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/src/com/dtmilano/android/code_generator.py

@@ -3,7 +3,7 @@ import textwrap
 from abc import ABC
 from datetime import date
 
-__version__ = '23.4.0'
+__version__ = '24.0.0'
 
 from typing import TextIO, Union, Dict, List
 

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/src/com/dtmilano/android/common.py

@@ -20,7 +20,7 @@ limitations under the License.
 
 from __future__ import print_function
 
-__version__ = '23.4.0'
+__version__ = '24.0.0'
 
 import ast
 import os

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/src/com/dtmilano/android/concertina.py

@@ -22,7 +22,7 @@ import json
 import random
 
 __author__ = 'diego'
-__version__ = '23.4.0'
+__version__ = '24.0.0'
 
 DEBUG = True
 

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/src/com/dtmilano/android/controlpanel.py

@@ -20,7 +20,7 @@
     '''
 import platform
 
-__version__ = '23.4.0'
+__version__ = '24.0.0'
 
 import tkinter
 import tkinter.ttk

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/src/com/dtmilano/android/culebron.py

@@ -38,7 +38,7 @@ from com.dtmilano.android.keyevent import KEY_EVENT
 from com.dtmilano.android.uiautomator.uiautomatorhelper import UiAutomatorHelper
 from com.dtmilano.android.viewclient import ViewClient, View, VERSION_SDK_PROPERTY
 
-__version__ = '23.4.0'
+__version__ = '24.0.0'
 
 import sys
 import threading
@@ -412,7 +412,7 @@ This is usually installed by python package. Check your distribution details.
         if self.scale != 1:
             scaledWidth = int(width * self.scale)
             scaledHeight = int(height * self.scale)
-            self.image = self.image.resize((scaledWidth, scaledHeight), PIL.Image.ANTIALIAS)
+            self.image = self.image.resize((scaledWidth, scaledHeight), PIL.Image.LANCZOS)
             (width, height) = self.image.size
             if self.isDarwin and 14 < self.sdkVersion < 23:
                 if sys.version_info[0] < 3:

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/src/com/dtmilano/android/plot.py

@@ -31,7 +31,7 @@ from mpl_toolkits.axes_grid1 import host_subplot
 
 from com.dtmilano.android.adb.dumpsys import Dumpsys
 
-__version__ = '23.4.0'
+__version__ = '24.0.0'
 
 DEBUG = False
 

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/src/com/dtmilano/android/robotframework/viewclientwrapper.py

@@ -18,7 +18,7 @@ limitations under the License.
 @author: Diego Torres Milano
 '''
 
-__version__ = '23.4.0'
+__version__ = '24.0.0'
 __author__ = 'diego'
 
 import sys

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py

@@ -20,7 +20,7 @@ limitations under the License.
 
 from __future__ import print_function
 
-__version__ = '23.4.0'
+__version__ = '24.0.0'
 
 import math
 import os

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/src/com/dtmilano/android/viewclient.py

@@ -26,7 +26,7 @@ from typing import Optional, Union, Dict, Tuple
 import culebratester_client
 from culebratester_client import WindowHierarchyChild, WindowHierarchy
 
-__version__ = '23.4.0'
+__version__ = '24.0.0'
 
 import sys
 import warnings
@@ -143,8 +143,8 @@ INVISIBLE = 0x4
 GONE = 0x8
 
 RegexType = type(re.compile(''))
-IP_RE = re.compile('^(\d{1,3}\.){3}\d{1,3}$')
-ID_RE = re.compile('id/([^/]*)(/(\d+))?')
+IP_RE = re.compile(r'^(\d{1,3}\.){3}\d{1,3}$')
+ID_RE = re.compile(r'id/([^/]*)(/(\d+))?')
 IP_DOMAIN_NAME_PORT_REGEX = r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|' \
                             r'localhost|' \
                             r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' \
@@ -872,21 +872,21 @@ class View:
         dww = self.device.shell('dumpsys window windows')
         if DEBUG_WINDOWS or debug: print(dww, file=sys.stderr)
         lines = dww.splitlines()
-        widRE = re.compile('^ *Window #%s Window\{%s (u\d+ )?%s?.*\}:' %
+        widRE = re.compile(r'^ *Window #%s Window\{%s (u\d+ )?%s?.*\}:' %
                            (_nd('num'), _nh('winId'), _ns('activity', greedy=True)))
-        currentFocusRE = re.compile('^  mCurrentFocus=Window\{%s .*' % _nh('winId'))
+        currentFocusRE = re.compile(r'^  mCurrentFocus=Window\{%s .*' % _nh('winId'))
         viewVisibilityRE = re.compile(' mViewVisibility=0x%s ' % _nh('visibility'))
         # This is for 4.0.4 API-15
-        containingFrameRE = re.compile('^   *mContainingFrame=\[%s,%s\]\[%s,%s\] mParentFrame=\[%s,%s\]\[%s,%s\]' %
+        containingFrameRE = re.compile(r'^   *mContainingFrame=\[%s,%s\]\[%s,%s\] mParentFrame=\[%s,%s\]\[%s,%s\]' %
                                        (_nd('cx'), _nd('cy'), _nd('cw'), _nd('ch'), _nd('px'), _nd('py'), _nd('pw'),
                                         _nd('ph')))
-        contentFrameRE = re.compile('^   *mContentFrame=\[%s,%s\]\[%s,%s\] mVisibleFrame=\[%s,%s\]\[%s,%s\]' %
+        contentFrameRE = re.compile(r'^   *mContentFrame=\[%s,%s\]\[%s,%s\] mVisibleFrame=\[%s,%s\]\[%s,%s\]' %
                                     (_nd('x'), _nd('y'), _nd('w'), _nd('h'), _nd('vx'), _nd('vy'), _nd('vx1'),
                                      _nd('vy1')))
         # This is for 4.1 API-16
-        framesRE = re.compile('^   *Frames: containing=\[%s,%s\]\[%s,%s\] parent=\[%s,%s\]\[%s,%s\]' %
+        framesRE = re.compile(r'^   *Frames: containing=\[%s,%s\]\[%s,%s\] parent=\[%s,%s\]\[%s,%s\]' %
                               (_nd('cx'), _nd('cy'), _nd('cw'), _nd('ch'), _nd('px'), _nd('py'), _nd('pw'), _nd('ph')))
-        contentRE = re.compile('^     *content=\[%s,%s\]\[%s,%s\] visible=\[%s,%s\]\[%s,%s\]' %
+        contentRE = re.compile(r'^     *content=\[%s,%s\]\[%s,%s\] visible=\[%s,%s\]\[%s,%s\]' %
                                (_nd('x'), _nd('y'), _nd('w'), _nd('h'), _nd('vx'), _nd('vy'), _nd('vx1'), _nd('vy1')))
         policyVisibilityRE = re.compile('mPolicyVisibility=%s ' % _ns('policyVisibility', greedy=True))
 
@@ -1237,7 +1237,7 @@ class View:
         # __str = str("View[", 'utf-8', 'replace')
         __str = "View["
         if "class" in self.map:
-            __str += " class=" + re.sub('.*\.', '', self.map['class'])
+            __str += " class=" + re.sub(r'.*\.', '', self.map['class'])
         __str += " id=%s" % self.getId()
         __str += " ]"
 
@@ -2394,7 +2394,7 @@ class UiAutomator2AndroidViewClient():
         elif name == 'node':
             # Instantiate an Element object
             attributes['uniqueId'] = 'id/no_id/%d' % self.idCount
-            bounds = re.split('[\][,]', attributes['bounds'])
+            bounds = re.split(r'[\][,]', attributes['bounds'])
             attributes['bounds'] = ((int(bounds[1]), int(bounds[2])), (int(bounds[4]), int(bounds[5])))
             if DEBUG_BOUNDS:
                 print("bounds=", attributes['bounds'], file=sys.stderr)
@@ -3224,8 +3224,8 @@ class ViewClient:
             s2 = s1.replace(' ', WS)
             strArgs = strArgs.replace(s1, s2, 1)
 
-        idRE = re.compile("(?P<viewId>id/\S+)")
-        attrRE = re.compile('%s(?P<parens>\(\))?=%s,(?P<val>[^ ]*)' % (_ns('attr'), _nd('len')), flags=re.DOTALL)
+        idRE = re.compile(r"(?P<viewId>id/\S+)")
+        attrRE = re.compile(r'%s(?P<parens>\(\))?=%s,(?P<val>[^ ]*)' % (_ns('attr'), _nd('len')), flags=re.DOTALL)
         hashRE = re.compile('%s@%s' % (_ns('class'), _nh('oid')))
 
         attrs = {}
@@ -3269,7 +3269,7 @@ class ViewClient:
                 # sometimes the view ids are not unique, so let's generate a unique id here
                 i = 1
                 while True:
-                    newId = re.sub('/\d+$', '', viewId) + '/%d' % i
+                    newId = re.sub(r'/\d+$', '', viewId) + '/%d' % i
                     if not newId in self.viewsById:
                         break
                     i += 1
@@ -3579,13 +3579,13 @@ class ViewClient:
                 if self.ignoreUiAutomatorKilled:
                     if DEBUG_RECEIVED:
                         print("ignoring UiAutomator Killed", file=sys.stderr)
-                    killedRE = re.compile('</hierarchy>[\n\S]*Killed', re.MULTILINE)
+                    killedRE = re.compile(r'</hierarchy>[\n\S]*Killed', re.MULTILINE)
                     if killedRE.search(received):
                         received = re.sub(killedRE, '</hierarchy>', received)
                     elif DEBUG_RECEIVED:
                         print("UiAutomator Killed: NOT FOUND!")
                     # It seems that API18 uiautomator spits this message to stdout
-                    dumpedToDevTtyRE = re.compile('</hierarchy>[\n\S]*UI hierchary dumped to: /dev/tty.*', re.MULTILINE)
+                    dumpedToDevTtyRE = re.compile(r'</hierarchy>[\n\S]*UI hierchary dumped to: /dev/tty.*', re.MULTILINE)
                     if dumpedToDevTtyRE.search(received):
                         received = re.sub(dumpedToDevTtyRE, '</hierarchy>', received)
                     if DEBUG_RECEIVED:
@@ -3595,7 +3595,7 @@ class ViewClient:
                 received = received.replace(
                     'WARNING: linker: libdvm.so has text relocations. This is wasting memory and is a security risk. Please fix.\r\n',
                     '')
-                if re.search('\[: not found', received):
+                if re.search(r'\[: not found', received):
                     raise RuntimeError('''ERROR: Some emulator images (i.e. android 4.1.2 API 16 generic_x86) does not include the '[' command.
     While UiAutomator back-end might be supported 'uiautomator' command fails.
     You should force ViewServer back-end.''')

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/tools/culebra

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-"""
+r"""
 Copyright (C) 2013-2023  Diego Torres Milano
 Created on Mar 28, 2013
 
@@ -28,7 +28,7 @@ from typing import Pattern
 import culebratester_client
 from culebratester_client import WindowHierarchy, Selector
 
-__version__ = '23.4.0'
+__version__ = '24.0.0'
 
 import calendar
 import codecs
@@ -1295,7 +1295,7 @@ def getWindowOption():
 
 
 def printScriptHeader():
-    print(f'''{getShebangJar()}
+    print(rf'''{getShebangJar()}
 # -*- coding: utf-8 -*-
 """
 Copyright (C) 2013-2023  Diego Torres Milano

{androidviewclient-23.4.0 → androidviewclient-24.0.0}/tools/dump

@@ -8,7 +8,7 @@ Created on Feb 3, 2012
 
 from __future__ import print_function
 
-__version__ = '23.4.0'
+__version__ = '24.0.0'
 
 import getopt
 import os