mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-06 17:30:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add ensurers

Browse source
This commit is contained in:
Guillaume Leclerc 2016-05-19 16:44:56 +02:00
parent eec7c0992d
commit 94591b88f3
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xonsh/environ.py
View file

@ -26,7 +26,7 @@ from xonsh.tools import (
is_completions_display_value, to_completions_display_value, is_string_set, is_completions_display_value, to_completions_display_value, is_string_set,
csv_to_set, set_to_csv, get_sep, is_int, is_bool_seq, csv_to_bool_seq, csv_to_set, set_to_csv, get_sep, is_int, is_bool_seq, csv_to_bool_seq,
bool_seq_to_csv, DefaultNotGiven, setup_win_unicode_console, bool_seq_to_csv, DefaultNotGiven, setup_win_unicode_console,
intensify_colors_on_win_setter intensify_colors_on_win_setter, is_dynamic_cwd_width, to_dynamic_cwd_tuple, dynamic_cwd_tuple_to_str
) )
from xonsh.codecache import run_script_with_cache from xonsh.codecache import run_script_with_cache
from xonsh.dirstack import _get_cwd from xonsh.dirstack import _get_cwd
@ -85,7 +85,7 @@ DEFAULT_ENSURERS = {
'PATHEXT': (is_env_path, str_to_env_path, env_path_to_str), 'PATHEXT': (is_env_path, str_to_env_path, env_path_to_str),
'RAISE_SUBPROC_ERROR': (is_bool, to_bool, bool_to_str), 'RAISE_SUBPROC_ERROR': (is_bool, to_bool, bool_to_str),
'RIGHT_PROMPT': (is_string, ensure_string, ensure_string), 'RIGHT_PROMPT': (is_string, ensure_string, ensure_string),
'DYNAMIC_CWD_WIDTH': (is_string, ensure_string, ensure_string), 'DYNAMIC_CWD_WIDTH': (is_dynamic_cwd_width, to_dynamic_cwd_tuple, dynamic_cwd_tuple_to_str),
'TEEPTY_PIPE_DELAY': (is_float, float, str), 'TEEPTY_PIPE_DELAY': (is_float, float, str),
'UPDATE_OS_ENVIRON': (is_bool, to_bool, bool_to_str), 'UPDATE_OS_ENVIRON': (is_bool, to_bool, bool_to_str),
'XONSHRC': (is_env_path, str_to_env_path, env_path_to_str), 'XONSHRC': (is_env_path, str_to_env_path, env_path_to_str),

21
xonsh/tools.py
View file

@ -736,6 +736,27 @@ def is_history_tuple(x):
return False return False
def is_dynamic_cwd_width(x):
if x[-1] == '%':
x = x[:-1]
return x.isdigit()
def to_dynamic_cwd_tuple(x):
unit = 'c'
if x[-1] == '%':
x = x[:-1]
unit = '%'
return (float(x), unit)
def dynamic_cwd_tuple_to_str(x):
if x[1] == '%':
return str(x[0]) + '%'
else:
return str(x[0])
RE_HISTORY_TUPLE = re.compile('([-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)\s*([A-Za-z]*)') RE_HISTORY_TUPLE = re.compile('([-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?)\s*([A-Za-z]*)')
def to_history_tuple(x): def to_history_tuple(x):