Skip to content

Commit 60f964b

Browse files
dtmilanodtmilano
committed
Version 20.0.0b1
1 parent af44aeb commit 60f964b

13 files changed

Lines changed: 26 additions & 23 deletions

File tree

‎setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from setuptools import setup, find_packages
44

55
setup(name='androidviewclient',
6-
version='20.0.0',
6+
version='20.0.0b1',
77
description='''AndroidViewClient is a 100% pure python library and tools
88
that simplifies test script creation providing higher level
99
operations and the ability of obtaining the tree of Views present at
@@ -19,7 +19,7 @@
1919
package_data={'':['*.png']},
2020
include_package_data=True,
2121
scripts=['tools/culebra', 'tools/dump'],
22-
classifiers=['Development Status :: 5 - Production/Stable',
22+
classifiers=['Development Status :: 4 - Beta'
2323
'Intended Audience :: Developers',
2424
'License :: OSI Approved :: Apache Software License'],
2525
install_requires=['setuptools', 'requests', 'numpy', 'matplotlib', 'culebratester-client'],

‎src/com/dtmilano/android/adb/adbclient.py‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
from com.dtmilano.android.adb.dumpsys import Dumpsys
2828

29-
__version__ = '20.0.0'
29+
__version__ = '20.0.0b1'
3030

3131
import sys
3232
import warnings
@@ -314,7 +314,7 @@ def __send(self, msg, checkok=True, reconnect=False):
314314

315315
def __receive(self, nob=None, sock=None):
316316
if DEBUG:
317-
print("__receive(nob=%s)" % nob, file=sys.stderr)
317+
print("🟨 __receive(nob=%s)" % nob, file=sys.stderr)
318318
if not sock:
319319
sock = self.socket
320320
self.checkConnected(sock)
@@ -323,23 +323,25 @@ def __receive(self, nob=None, sock=None):
323323
if nob is None:
324324
nob = int(sock.recv(4), 16)
325325
if DEBUG:
326-
print(" __receive: receiving", nob, "bytes", file=sys.stderr)
326+
print("🟨 __receive: receiving", nob, "bytes", file=sys.stderr)
327327
recv = bytearray(nob)
328-
view = memoryview(recv)
328+
mview = memoryview(recv)
329329
nr = 0
330330
while nr < nob:
331-
l = sock.recv_into(view, len(view))
331+
l = sock.recv_into(mview, len(mview))
332332
if DEBUG:
333-
print("l=", l, "nr=", nr, file=sys.stderr)
334-
print("timer=", self.timers[timerId], file=sys.stderr)
335-
view = view[l:]
333+
print("🟨 __receive: recv_into(mview, %d):" % len(mview), file=sys.stderr)
334+
print("🟨 __receive: l=", l, "nr=", nr, file=sys.stderr)
335+
print("🟨 __receive: timer=", self.timers[timerId], file=sys.stderr)
336+
mview = mview[l:]
336337
nr += l
337338
if self.timers[timerId] == 'EXPIRED':
338339
raise Timer.TimeoutException('%d EXPIRED' % timerId)
339340
finally:
340341
self.cancelTimer(timerId)
341342
if DEBUG:
342-
print(" __receive: returning len=", len(recv), file=sys.stderr)
343+
print("🟨 __receive: returning len=", len(recv), file=sys.stderr)
344+
print("🟨 __receive: '%s'" % repr(recv), file=sys.stderr)
343345
return recv
344346

345347
def __checkOk(self, sock=None):
@@ -356,7 +358,7 @@ def __checkOk(self, sock=None):
356358
self.cancelTimer(timerId)
357359

358360
if DEBUG:
359-
print(" __checkOk: recv=", repr(recv), file=sys.stderr)
361+
print(" __checkOk: recv(4)=", repr(recv), file=sys.stderr)
360362

361363
timerId = self.setTimer(timeout=self.timeout, description="checkOK")
362364
try:
@@ -527,6 +529,7 @@ def shell(self, _cmd=None, _convertOutputToString=True):
527529
chunk = None
528530
try:
529531
chunk = self.socket.recv(4096)
532+
print('🟣 chunk=%s' % chunk)
530533
except Exception as ex:
531534
print("ERROR:", ex, file=sys.stderr)
532535
if not chunk:

‎src/com/dtmilano/android/adb/dumpsys.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import sys
2424
from _warnings import warn
2525

26-
__version__ = '20.0.0'
26+
__version__ = '20.0.0b1'
2727

2828
DEBUG = False
2929

‎src/com/dtmilano/android/common.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from __future__ import print_function
2222

23-
__version__ = '20.0.0'
23+
__version__ = '20.0.0b1'
2424

2525
import ast
2626
import os

‎src/com/dtmilano/android/concertina.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import random
2323

2424
__author__ = 'diego'
25-
__version__ = '20.0.0'
25+
__version__ = '20.0.0b1'
2626

2727
DEBUG = True
2828

‎src/com/dtmilano/android/controlpanel.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
'''
2121
import platform
2222

23-
__version__ = '20.0.0'
23+
__version__ = '20.0.0b1'
2424

2525
import tkinter
2626
import tkinter.ttk

‎src/com/dtmilano/android/culebron.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
from com.dtmilano.android.concertina import Concertina
3434
from com.dtmilano.android.viewclient import ViewClient
3535

36-
__version__ = '20.0.0'
36+
__version__ = '20.0.0b1'
3737

3838
import sys
3939
import threading

‎src/com/dtmilano/android/plot.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
from com.dtmilano.android.adb.dumpsys import Dumpsys
3333

34-
__version__ = '20.0.0'
34+
__version__ = '20.0.0b1'
3535

3636
DEBUG = True
3737

‎src/com/dtmilano/android/robotframework/viewclientwrapper.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@author: Diego Torres Milano
1919
'''
2020

21-
__version__ = '20.0.0'
21+
__version__ = '20.0.0b1'
2222
__author__ = 'diego'
2323

2424
import sys

‎src/com/dtmilano/android/uiautomator/uiautomatorhelper.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from __future__ import print_function
2222

23-
__version__ = '20.0.0'
23+
__version__ = '20.0.0b1'
2424

2525
import json
2626
import os

0 commit comments

Comments
 (0)