IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed another small CLI decoding problem (multivalue args in a tuple now work)

Browse Source
This commit is contained in:
Jason Gerard DeRose 2009-01-23 09:55:38 -07:00 committed by Rob Crittenden
parent e537dc89cb
commit c0bc2451dd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ipalib/cli.py
View File

@ -110,19 +110,19 @@ class textui(backend.Backend):
def __get_encoding(self, stream): def __get_encoding(self, stream):
assert stream in (sys.stdin, sys.stdout) assert stream in (sys.stdin, sys.stdout)
if stream.encoding is None: if stream.encoding is None:
if stream.isatty():
return sys.getdefaultencoding()
return 'UTF-8' return 'UTF-8'
return stream.encoding return stream.encoding
def decode(self, str_buffer): def decode(self, value):
""" """
Decode text from stdin. Decode text from stdin.
""" """
if type(str_buffer) is str: if type(value) is str:
encoding = self.__get_encoding(sys.stdin) encoding = self.__get_encoding(sys.stdin)
return str_buffer.decode(encoding) return value.decode(encoding)
return str_buffer elif type(value) in (list, tuple):
return tuple(self.decode(v) for v in value)
return value
def encode(self, unicode_text): def encode(self, unicode_text):
""" """