Skip to content

Commit 7e43337

Browse files
authored
Merge pull request python-mode#851 from diraol/updating-submodules
Update submodules and some other fixes
2 parents e0a828c + 4ef271c commit 7e43337

File tree

9 files changed

+11
-8
lines changed

9 files changed

+11
-8
lines changed

pymode/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class Options(object):
2222
in_place = True
2323
indent_size = int(vim.eval('&tabstop'))
2424
line_range = None
25+
hang_closing = False
2526
max_line_length = int(vim.eval('g:pymode_options_max_line_length'))
2627
pep8_passes = 100
2728
recursive = False

submodules/mccabe

Submodule mccabe updated 1 file

submodules/pylama

tests/test_helpers_bash/test_prepare_between_tests.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
# Prepare tests.
44
set +e
5-
rm $VIM_DISPOSABLE_PYFILE
5+
if [ -f $VIM_DISPOSABLE_PYFILE ]; then
6+
rm $VIM_DISPOSABLE_PYFILE
7+
fi
68
export VIM_DISPOSABLE_PYFILE=`mktemp /tmp/pymode.tmpfile.XXXXXXXXXX.py`
79
set -e
810
touch $VIM_DISPOSABLE_PYFILE

tests/test_helpers_bash/test_variables.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Define variables for common test scripts.
44

55
# Set variables.
6-
export VIM_DISPOSABLE_PYFILE=/tmp/pymode_disposable.py
6+
export VIM_DISPOSABLE_PYFILE=`mktemp /tmp/pymode.tmpfile.XXXXXXXXXX.py`
77
export VIM_OUTPUT_FILE=/tmp/pymode.out
88
export VIM_TEST_VIMRC=/tmp/pymode_vimrc
99
export VIM_TEST_PYMODECOMMANDS=/tmp/pymode_commands.txt

0 commit comments

Comments
 (0)