Skip to content

Update submodules and some other fixes #851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pymode/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class Options(object):
in_place = True
indent_size = int(vim.eval('&tabstop'))
line_range = None
hang_closing = False
max_line_length = int(vim.eval('g:pymode_options_max_line_length'))
pep8_passes = 100
recursive = False
Expand Down
2 changes: 1 addition & 1 deletion submodules/autopep8
2 changes: 1 addition & 1 deletion submodules/mccabe
Submodule mccabe updated 1 files
+3 −0 setup.cfg
2 changes: 1 addition & 1 deletion submodules/pylama
Submodule pylama updated 1 files
+6 −3 pylama/core.py
4 changes: 3 additions & 1 deletion tests/test_helpers_bash/test_prepare_between_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

# Prepare tests.
set +e
rm $VIM_DISPOSABLE_PYFILE
if [ -f $VIM_DISPOSABLE_PYFILE ]; then
rm $VIM_DISPOSABLE_PYFILE
fi
export VIM_DISPOSABLE_PYFILE=`mktemp /tmp/pymode.tmpfile.XXXXXXXXXX.py`
set -e
touch $VIM_DISPOSABLE_PYFILE
Expand Down
2 changes: 1 addition & 1 deletion tests/test_helpers_bash/test_variables.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Define variables for common test scripts.

# Set variables.
export VIM_DISPOSABLE_PYFILE=/tmp/pymode_disposable.py
export VIM_DISPOSABLE_PYFILE=`mktemp /tmp/pymode.tmpfile.XXXXXXXXXX.py`
export VIM_OUTPUT_FILE=/tmp/pymode.out
export VIM_TEST_VIMRC=/tmp/pymode_vimrc
export VIM_TEST_PYMODECOMMANDS=/tmp/pymode_commands.txt
Expand Down