Commit graph

1591 commits

Author SHA1 Message Date
selepo
37a130c775 merge conflict resolved 2015-11-18 20:27:59 +01:00
selepo
ed8b6ce37c bugfix for issue 466 with xonsh.bat installed in non-windows 2015-11-18 18:50:17 +01:00
Anthony Scopatz
8a51d9e6f4 Merge pull request #506 from krader1961/lint-cleanup
make base_shell lint clean
2015-11-17 10:08:46 -05:00
Kurtis Rader
588a3acd18 make TeeOut and TeeErr private to module 2015-11-17 07:02:07 -08:00
Kurtis Rader
d3a300d801 make base_shell lint clean 2015-11-16 15:36:45 -08:00
Anthony Scopatz
5921c2d6f1 Merge pull request #505 from krader1961/pip-utf8-workaround
accomodate pip bug by making setup.py ascii
2015-11-16 18:20:22 -05:00
Kurtis Rader
95c361aec7 accomodate pip bug by making setup.py ascii
Resolves #487.

Since I was touching this to resolve issue #487 I decided to make it lint
clean as well.
2015-11-16 15:12:02 -08:00
Anthony Scopatz
74c4cb4912 Merge pull request #504 from krader1961/lint-cleanup
add a uniform character encoding to all files
2015-11-16 18:02:41 -05:00
Kurtis Rader
e88c863d10 Add a uniform character encoding to all files.
I wouldn't normally do something like this but issue #487 brought to
my attention the fact that too many of the python modules don't have
an encoding comment and of those that do there is a lot of pointless
inconsistency in the style of the comment.
2015-11-16 14:10:40 -08:00
Anthony Scopatz
a8414ce57c Merge pull request #503 from krader1961/lint-cleanup
Make ast lint clean.
2015-11-16 11:02:47 -05:00
Kurtis Rader
c2852ef847 Make ast lint clean. 2015-11-15 20:18:00 -08:00
Anthony Scopatz
4c5387e1bd Merge pull request #500 from krader1961/lint-cleanup
Make history module mostly lint clean.
2015-11-15 22:34:26 -05:00
Anthony Scopatz
bfc316fb58 Merge pull request #492 from krader1961/add-makefile
Add a makefile defining some common tasks.
2015-11-15 22:30:07 -05:00
Anthony Scopatz
ca5974ba26 Merge branch 'ptwin' 2015-11-15 22:27:34 -05:00
Kurtis Rader
23187e2044 clarify how to test incl. locally installed code 2015-11-15 18:02:51 -08:00
Kurtis Rader
f16268e108 don't instantiate history cmd parser at startup
We want to avoid doing anything at startup that can be deferred. So instead of
creating the history command parser on module import memoize the function.
2015-11-15 17:40:14 -08:00
Anthony Scopatz
6c4b8937e5 Merge pull request #495 from gforsyth/vi_mode_config
allow user to enable vi_mode in prompt_toolkit
2015-11-15 10:27:07 -05:00
Gil Forsyth
8ed96da1f4 fix teardown bug
I'm not completely sure of the mechanism, but by assigning the value of
`builtins.__xonsh_env__.get('VI_MODE')` to an instance attribute the PT
history teardown routine throws an error on exit.

Instead, just feed the True/False value from the `.get()` directly to
the lambda function that runs the vi_mode keybinding.  Everything still
works as expected and no errors on exit.
2015-11-15 10:18:45 -05:00
Anthony Scopatz
692572a1d6 prompt toolkit windows changes 2015-11-15 09:35:57 -05:00
Anthony Scopatz
356a4da17a Merge pull request #498 from nicfit/ignoreeof
Added IGNOREEOF env variable to disable CTRL-D shell exit.
2015-11-15 08:13:51 -05:00
Kurtis Rader
7ccfb171aa Make history module mostly lint clean.
This fixes most of the lint errors in the history code. It also fixes
two bugs that were found by pylint due to misnamed variables. This patch
does not make any functional changes. I'll fix the remaining lint errors
in a subsequent patch when I tackle cross-module issues.
2015-11-14 19:56:26 -08:00
Kurtis Rader
40034d7315 Replace run_tests bash script with xsh script.
This replaces the bash script I originally proposed as a way to safely invoke
unit tests with a xonsh script (we need to eat our own dog food). This also
udpates the documentation.
2015-11-14 19:20:00 -08:00
Anthony Scopatz
538f1ec0c1 Merge pull request #468 from uranusjr/console_scripts
Use console_scripts to generate entry point
2015-11-14 12:49:57 -05:00
Gil Forsyth
b69e4dd251 Merge branch 'master' of https://github.com/scopatz/xonsh into vi_mode_config 2015-11-14 12:34:35 -05:00
Anthony Scopatz
8fc6757131 Merge pull request #494 from gforsyth/pt_deprec_fix
replace `get_input` with `prompt`
2015-11-14 11:11:16 -05:00
Anthony Scopatz
41c398412b Merge pull request #483 from scopatz/prevpost
modifies source-foriegn to accept code
2015-11-14 11:09:39 -05:00
Anthony Scopatz
47a3b753c8 Merge pull request #490 from gforsyth/open_in_editor
add open in editor to prompt_toolkit_shell
2015-11-14 10:43:35 -05:00
Travis Shirk
925c65c995 Added IGNOREEOF env variable to disable CTRL-D shell exit. 2015-11-13 21:50:50 -07:00
Kurtis Rader
333468d719 Ensure lexer/parser table module is current
Ensure lexer/parser table module is current before running any tests.
2015-11-12 17:51:06 -08:00
Gil Forsyth
8adab63723 allow user to enable vi_mode in prompt_toolkit
This adds the envvar `VI_MODE`, (default `False`).  If it is set to `True`,
either in a `.xonshrc` or dynamically, then the prompt is switched to
`vi_mode`.

`vi_mode` defaults to an `--insert--` environment, then user can hit ESC
to enter command mode, etc...
2015-11-12 16:15:32 -05:00
Gil Forsyth
ca8f9eb8e2 replace get_input with prompt
Quick change removing the deprecated `get_input` and replacing it with
`prompt`
2015-11-12 15:52:23 -05:00
Anthony Scopatz
c9ec8199b0 check prevcmd 2015-11-12 08:23:24 -05:00
Kurtis Rader
27132bb999 Add a makefile defining some common tasks.
This makefile makes it easier to run things like unit tests and pylint
against the code. Especially before doing a commit. It also helps ensure
unit tests are not affected by local config files (e.g., ~/.xonshrc).
2015-11-11 18:05:17 -08:00
Gil Forsyth
a0018500c5 add open in editor to prompt_toolkit_shell
h/t @jonathanslenders

When using the prompt_toolkit shell, user can press Ctrl-X Ctrl-E to
open the current line in $EDITOR.

Limitations -- it can only open the _current_ line, so if you are
already in a multiline prompt, you can't edit what is already entered in
lines above.

However, you can enter multiline commands in the editor and these are
correctly interpreted by xonsh (assuming correct syntax, etc)
2015-11-11 13:53:24 -05:00
Anthony Scopatz
dd7d761656 modifies source-foriegn to accept code 2015-11-09 00:50:48 -05:00
Anthony Scopatz
0762ff5433 Merge pull request #482 from migueldvb/index
Mention where the Arch linux package can be found
2015-11-08 23:13:40 -05:00
Miguel de Val-Borro
d6dc6c08ed Mention explicitly where the Arch package can be found 2015-11-08 22:32:28 -05:00
Anthony Scopatz
208d8f73e9 Merge pull request #480 from Dundee/master
installation of jupyter hook to given destination
2015-11-08 16:15:50 -05:00
Anthony Scopatz
eeaec0d649 Merge pull request #481 from emacs18/master
Prevent garbled prompt for shells within emacs
2015-11-08 16:13:57 -05:00
Richard Kim
a604806374 Prevent garbled prompt for shells within emacs 2015-11-08 12:56:15 -08:00
Daniel Milde
c650bc8a2b installation of jupyter hook to given destination 2015-11-08 21:15:08 +01:00
Anthony Scopatz
0af49af6c4 version 0.2.3 bump 2015-11-06 21:40:52 -05:00
Anthony Scopatz
a764975cd1 Merge branch 'krader1961-negative-history-slices' 2015-11-06 21:29:49 -05:00
Anthony Scopatz
06086d7458 Merge branch 'negative-history-slices' of https://github.com/krader1961/xonsh into krader1961-negative-history-slices 2015-11-06 21:28:53 -05:00
Kurtis Rader
4be4509a2e Modify the code to comply with the alias API. 2015-11-06 17:38:08 -08:00
Anthony Scopatz
17f52ff3af Merge branch 'jupyter' 2015-11-06 19:15:32 -05:00
Anthony Scopatz
25cc8fb845 fixed minor conflict 2015-11-06 19:12:33 -05:00
Kurtis Rader
5cc784a721 Correct function names to follow PEP8. 2015-11-06 15:12:33 -08:00
Kurtis Rader
a14a9a6f4d Correct handling of negative history indexes.
Fix the handling of negative history indexes where a slice specification
is involved. Negative indexes not part of a slice specification worked by
accident because the argparse module (see section "16.4.4.3 Arguments
containing --") treats such values as positional arguments (which is a
misfeature of argparse in my opinion). I've also added unit tests for
"history show" to keep this from being broken in the future.
2015-11-05 19:35:41 -08:00
Anthony Scopatz
7a71221c17 Merge branch 'BYK-is_root' 2015-11-05 12:22:23 -05:00