From 0a0eab11a3e2de856a7b874050efd2803b570621 Mon Sep 17 00:00:00 2001 From: Anthony Scopatz Date: Tue, 6 Sep 2016 22:46:04 -0400 Subject: [PATCH] tests run, if though they fail --- .gitignore | 1 + xonsh/main.py | 4 ++-- xonsh/proc.py | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0c972c4c5..af6ce8500 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ include/ .coverage feedstock/ *.cred +tests/tttt diff --git a/xonsh/main.py b/xonsh/main.py index 18dbfe64d..39926a4f7 100644 --- a/xonsh/main.py +++ b/xonsh/main.py @@ -11,7 +11,7 @@ from xonsh import __version__ from xonsh.lazyasd import lazyobject from xonsh.shell import Shell from xonsh.pretty import pretty -from xonsh.proc import HiddenCompletedCommand +from xonsh.proc import HiddenCommand from xonsh.jobs import ignore_sigtstp from xonsh.tools import setup_win_unicode_console, print_color from xonsh.platform import HAS_PYGMENTS, ON_WINDOWS @@ -124,7 +124,7 @@ def _pprint_displayhook(value): if value is None: return builtins._ = None # Set '_' to None to avoid recursion - if isinstance(value, HiddenCompletedCommand): + if isinstance(value, HiddenCommand): builtins._ = value return env = builtins.__xonsh_env__ diff --git a/xonsh/proc.py b/xonsh/proc.py index 281772198..5934cb2f4 100644 --- a/xonsh/proc.py +++ b/xonsh/proc.py @@ -750,7 +750,7 @@ class Command: # Properties # - @propertybh + @property def stdin(self): """Process stdin.""" return self.proc.stdin @@ -770,7 +770,7 @@ class Command: """Creates normalized input string from args.""" return ' '.join(self.args) - @propety + @property def out(self): """Output value as a str.""" self.end() @@ -841,12 +841,12 @@ class Command: mode = getattr(stderr, 'mode', 'r') return [name, mode] - @propery + @property def timestamps(self): """The start and end time stamps.""" return [self.starttime, self.endtime] - @propery + @property def executed_cmd(self): """The resolve and executed command.""" return self.spec.cmd