openstack
/
deb-python-rcssmin
Code Issues Proposed changes

use curses APIs as intended

This commit is contained in:
ndparker 2015-03-15 13:04:49 +01:00
parent 575aecc254
commit 8d30069caf
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
py2/term/_term.py
View File

@ -1,6 +1,6 @@
# -*- coding: ascii -*-
#
# Copyright 2007, 2008, 2009, 2010, 2011
# Copyright 2007 - 2015
# Andr\xe9 Malo or his licensors, as applicable
#
# Licensed under the Apache License, Version 2.0 (the "License");
@ -54,8 +54,7 @@ class _INFO(dict):
""" Make color control string """
seq = _curses.tigetstr('setaf')
if seq is not None:
# XXX may fail - need better logic
seq = seq.replace("%p1", "") % color
seq = _curses.tparm(seq, color)
return seq
self['NORMAL'] = _curses.tigetstr('sgr0')
@ -71,7 +70,7 @@ class _INFO(dict):
def __getitem__(self, key):
""" Deliver always """
dict.get(self, key) or ""
return dict.get(self, key) or ""
def terminfo():
@ -111,5 +110,3 @@ def announce(fmt, **kwargs):
write(fmt, **kwargs)
_sys.stdout.write("\n")
_sys.stdout.flush()

14
py3/term/_term.py
View File

@ -1,6 +1,6 @@
# -*- coding: ascii -*-
#
# Copyright 2007, 2008, 2009, 2010, 2011
# Copyright 2007 - 2015
# Andr\xe9 Malo or his licensors, as applicable
#
# Licensed under the Apache License, Version 2.0 (the "License");
@ -53,16 +53,16 @@ class _INFO(dict):
try:
_curses.tigetstr('sgr0')
except TypeError: # pypy3
# pylint: disable = invalid-name
bc = lambda val: val.encode('ascii')
else:
bc = lambda val: val
bc = lambda val: val # pylint: disable = invalid-name
def make_color(color):
""" Make color control string """
seq = _curses.tigetstr(bc('setaf')).decode('ascii')
seq = _curses.tigetstr(bc('setaf'))
if seq is not None:
# XXX may fail - need better logic
seq = seq.replace("%p1", "") % color
seq = _curses.tparm(seq, color).decode('ascii')
return seq
self['NORMAL'] = _curses.tigetstr(bc('sgr0')).decode('ascii')
@ -79,7 +79,7 @@ class _INFO(dict):
def __getitem__(self, key):
""" Deliver always """
dict.get(self, key) or ""
return dict.get(self, key) or ""
def terminfo():
@ -119,5 +119,3 @@ def announce(fmt, **kwargs):
write(fmt, **kwargs)
_sys.stdout.write("\n")
_sys.stdout.flush()