Merge branch 'release/0.7.8b'

klen · klen · commit 626a3a9d6faa · 2013-12-05T12:07:47.000+07:00
diff --git a/AUTHORS b/AUTHORS
@@ -23,6 +23,7 @@ Contributors:
 * Lowe Thiderman (thiderman);
 * Martin Brochhaus (mbrochh);
 * Matthew Moses (mlmoses);
+* Mel Boyce (syngin)
 * Mohammed (mbadran);
 * Naoya Inada (naoina);
 * Pedro Algarvio (s0undt3ch);
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## 2013-12-04 0.7.7b
+## 2013-12-04 0.7.8b
 --------------------
     * Update indentation support;
     * Python3 support;
diff --git a/Makefile b/Makefile
@@ -11,7 +11,6 @@ clean:
 # Temporary disable rope tests on Travis
 .PHONY: travis
 travis:
-	rm -rf t/rope.vim
 	rake test
 
 .PHONY: test
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -6,7 +6,7 @@
     (__)   (__)  (__) (_) (_)(_____)(_)\_)   (_/\/\_)(_____)(____/(____)     ~
 
 
-                          Version: 0.7.7b
+                          Version: 0.7.8b
 
 ==============================================================================
 CONTENTS                                                       *pymode-contents*
@@ -312,7 +312,7 @@ after them 'C' and ...
 >
     let g:pymode_lint_sort = []
 
-Auto open cwindow (quickfix) if any errors has been finded
+Auto open cwindow (quickfix) if any errors have been found
                                                        *'g:pymode_lint_cwindow'*
 >
     let g:pymode_lint_cwindow = 1
@@ -335,7 +335,7 @@ Definitions for |signs|
 3. Rope support ~
                                                                    *pymode-rope*
 
-Pymode support Rope refactoring operations, code completion and code assists.
+Pymode supports Rope refactoring operations, code completion and code assists.
 
 Commands:
 |:PymodeRopeAutoImport| -- Resolve import for element under cursor
@@ -397,8 +397,8 @@ Regenerate project cache on every save (if file has been modified)
 4.1 Completion ~
                                                              *pymode-completion*
 
-By default you can use <Ctrl-Space> for autocompletion. Will be
-automatically selected first entry and you can press <Return> to insert in
+By default you can use <Ctrl-Space> for autocompletion. The first entry will
+be automatically selected and you can press <Return> to insert the entry in
 your code. <C-X><C-O> and <C-P>/<C-N> works too.
 
 Autocompletion is also called by typing a period in |Insert| mode by default.
@@ -552,8 +552,9 @@ Turn on pymode syntax                                        *'g:pymode_syntax'*
 >
     let g:pymode_syntax = 1
 
-More slow synchronizing. Disable on the slow machine, but code in docstrings
-could be broken.                                   *'g:pymode_syntax_slow_sync'*
+Slower syntax synchronization that is better at handling code blocks in
+docstrings. Consider disabling this on slower hardware.
+                                                   *'g:pymode_syntax_slow_sync'*
 >
     let g:pymode_syntax_slow_sync = 1
 
diff --git a/plugin/pymode.vim b/plugin/pymode.vim
@@ -1,5 +1,5 @@
 " vi: fdl=1 
-let g:pymode_version = "0.7.7b"
+let g:pymode_version = "0.7.8b"
 
 com! PymodeVersion echomsg "Current python-mode version: " . g:pymode_version
 com! PymodeTroubleshooting call pymode#troubleshooting#test()
diff --git a/pymode/environment.py b/pymode/environment.py
@@ -77,7 +77,11 @@ def var(self, name, to_bool=False):
         return value
 
     def message(self, msg, history=False):
-        """ Show message to user. """
+        """ Show message to user.
+
+        :return: :None
+
+        """
 
         if history:
             return vim.command('echom "%s"' % str(msg))
@@ -188,14 +192,16 @@ def let(self, name, value):
         self.debug(cmd)
         vim.command(cmd)
 
-    def prepare_value(self, value):
+    def prepare_value(self, value, dumps=True):
         """ Decode bstr to vim encoding.
 
         :return unicode string:
 
         """
 
-        value = json.dumps(value)
+        if dumps:
+            value = json.dumps(value)
+
         if PY2:
             value = value.decode('utf-8').encode(self.options.get('encoding'))
 
diff --git a/pymode/rope.py b/pymode/rope.py
@@ -85,7 +85,9 @@ def complete(dot=False):
     s_offset = codeassist.starting_offset(source, offset)
     p_prefix = prefix[offset - s_offset:]
     line = env.lines[row - 1]
-    env.curbuf[row - 1] = line[:col] + p_prefix + line[col:] # noqa
+    cline = line[:col] + p_prefix + line[col:]
+    if cline != line:
+        env.curbuf[row - 1] = env.prepare_value(cline, dumps=False)
     env.current.window.cursor = (row, col + len(p_prefix))
     env.run('complete', col - len(prefix) + len(p_prefix) + 1, proposals)
     return True
@@ -887,7 +889,8 @@ def _insert_import(name, module, ctx):
         source, _ = env.get_offset_params()
         lineno = ctx.importer.find_insertion_line(source)
         line = 'from %s import %s' % (module, name)
-        env.curbuf[lineno - 1:lineno - 1] = [line]
+        env.curbuf[lineno - 1:lineno - 1] = [
+            env.prepare_value(line, dumps=False)]
         return True
 
     pyobject = ctx.project.pycore.resource_to_pyobject(ctx.resource)
diff --git a/pymode/run.py b/pymode/run.py
@@ -13,7 +13,7 @@
 def run_code():
     """ Run python code in current buffer. """
 
-    errors = []
+    errors, err = [], ''
     line1, line2 = env.var('a:line1'), env.var('a:line2')
     lines = __prepare_lines(line1, line2)
 
diff --git a/t/rope.vim b/t/rope.vim
@@ -17,6 +17,11 @@ describe 'pymode-plugin'
     end
 
     it 'pymode rope auto open project in current working directory'
+
+        if $TRAVIS != ""
+            SKIP 'Travis fails on this test'
+        endif
+
         let project_path = getcwd() . '/.ropeproject'
         Expect isdirectory(project_path)  == 0
         normal oimporX
