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

cleanup

Browse source
This commit is contained in:
laerus 2016-07-29 19:42:00 +03:00
parent 14f37adf20
commit 80a9798981
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xonsh/history.py
View file

@ -426,7 +426,7 @@ def _hist_filter_ts(commands, start_time=None, end_time=None):
if end_time is None:
end_time = float('inf')
for cmd in commands:
if end_time > cmd[1] > start_time:
if start_time <= cmd[1] < end_time:
yield cmd
@ -447,7 +447,7 @@ def _hist_get(session='session', slices=None,
Returns
-------
list
generator
A filtered list of commands
"""
cmds = _hist_get_session(session, location)
@ -462,14 +462,14 @@ def _hist_show(ns, *args, **kwargs):
"""Show the requested portion of shell history. Accepts same parameters
with `_hist_get`."""
try:
commands = _hist_get(ns.session, ns.slices, **kwargs)
commands = list(_hist_get(ns.session, ns.slices, **kwargs))
except ValueError as err:
print("history: error: {}".format(err), file=sys.stderr)
return
if not commands:
return
if ns.reverse:
commands = reversed(list(commands))
commands = reversed(commands)
if not ns.numerate:
for c, _, _ in commands:
print(c)

2
xonsh/tools.py
View file

@ -926,7 +926,7 @@ def SLICE_REG():
def ensure_slice(x):
"""Convert `x` to a slice. If `x` is already a slice object return as is."""
"""Try to convert an object into a slice, complain on failure"""
if not x:
return slice(None)
elif isinstance(x, slice):