Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle CLI pathological case

Browse Source 
svn: r21584
This commit is contained in:
Paul Franklin 2013-03-07 23:30:21 +00:00
parent 47b8dc8131
commit 7823280d22
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps/grampsapp.py
View File

@ -300,7 +300,7 @@ def show_settings():
try: try:
dotversion_str = Popen(['dot', '-V'], stderr=PIPE).communicate(input=None)[1] dotversion_str = Popen(['dot', '-V'], stderr=PIPE).communicate(input=None)[1]
if isinstance(dotversion_str, bytes): if isinstance(dotversion_str, bytes) and sys.stdin.encoding:
dotversion_str = dotversion_str.decode(sys.stdin.encoding) dotversion_str = dotversion_str.decode(sys.stdin.encoding)
if dotversion_str: if dotversion_str:
dotversion_str = dotversion_str.replace('\n','')[23:27] dotversion_str = dotversion_str.replace('\n','')[23:27]
@ -312,7 +312,7 @@ def show_settings():
gsversion_str = Popen(['gswin32c', '--version'], stdout=PIPE).communicate(input=None)[0] gsversion_str = Popen(['gswin32c', '--version'], stdout=PIPE).communicate(input=None)[0]
else: else:
gsversion_str = Popen(['gs', '--version'], stdout=PIPE).communicate(input=None)[0] gsversion_str = Popen(['gs', '--version'], stdout=PIPE).communicate(input=None)[0]
if isinstance(gsversion_str, bytes): if isinstance(gsversion_str, bytes) and sys.stdin.encoding:
gsversion_str = gsversion_str.decode(sys.stdin.encoding) gsversion_str = gsversion_str.decode(sys.stdin.encoding)
if gsversion_str: if gsversion_str:
gsversion_str = gsversion_str.replace('\n', '') gsversion_str = gsversion_str.replace('\n', '')