RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use 'with' lock syntax instead of acquire/release

This commit is contained in:
Daniel Pavel 2013-05-06 15:35:20 +02:00
parent 0283bb0e91
commit 15f24eb26b
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/hidapi/hidconsole.py
View File

@ -56,23 +56,23 @@ def _print(marker, data, scroll=False):
hexs = strhex(data) hexs = strhex(data)
s = '%s (% 8.3f) [%s %s %s %s] %s' % (marker, t, hexs[0:2], hexs[2:4], hexs[4:8], hexs[8:], repr(data)) s = '%s (% 8.3f) [%s %s %s %s] %s' % (marker, t, hexs[0:2], hexs[2:4], hexs[4:8], hexs[8:], repr(data))
print_lock.acquire() with print_lock:
# allow only one thread at a time to write to the console, otherwise
# the output gets garbled, especially with ANSI codes.
if interactive and scroll: if interactive and scroll:
# scroll the entire screen above the current line up by 1 line # scroll the entire screen above the current line up by 1 line
sys.stdout.write('\033[s' # save cursor position sys.stdout.write('\033[s' # save cursor position
'\033[S' # scroll up '\033[S' # scroll up
'\033[A' # cursor up '\033[A' # cursor up
'\033[L' # insert 1 line '\033[L' # insert 1 line
'\033[G') # move cursor to column 1 '\033[G') # move cursor to column 1
sys.stdout.write(s) sys.stdout.write(s)
if interactive and scroll: if interactive and scroll:
# restore cursor position # restore cursor position
sys.stdout.write('\033[u') sys.stdout.write('\033[u')
else: else:
sys.stdout.write('\n') sys.stdout.write('\n')
print_lock.release()
def _error(text, scroll=False): def _error(text, scroll=False):