Merge branch 'develop' of https://github.com/klen/python-mode into develop

Author: Danny Willems (cron)

AUTHORS

@@ -6,6 +6,7 @@ Maintainer:
 Contributors:
 
 * Alvin Francis (http://github.com/alvinfrancis);
+* Andriy Kohut (https://github.com/andriykohut)
 * Anler Hp (http://github.com/ikame);
 * Anton Parkhomenko (http://github.com/chuwy);
 * Ashley Hewson (http://github.com/ashleyh);
@@ -27,9 +28,11 @@ Contributors:
 * Jonathan McCall (http://github.com/Jonnymcc);
 * Kevin Deldycke (http://github.com/kdeldycke);
 * Kurtis Rader (https://github.com/krader1961);
+* Lawrence Akka (https://github.com/lawrenceakka);
 * Lowe Thiderman (http://github.com/thiderman);
 * Martin Brochhaus (http://github.com/mbrochh);
 * Matthew Moses (http://github.com/mlmoses);
+* Maxim (https://github.com/mpyatishev);
 * Mel Boyce (http://github.com/syngin);
 * Mohammed (http://github.com/mbadran);
 * Naoya Inada (http://github.com/naoina);
@@ -45,12 +48,15 @@ Contributors:
 * Sorin Ionescu (sorin-ionescu);
 * Steve Losh (http://github.com/sjl);
 * Tommy Allen (https://github.com/tweekmonster);
+* Tony Narlock (https://github.com/tony);
 * Tyler Fenby (https://github.com/TFenby);
 * Vincent Driessen (https://github.com/nvie);
+* Wang Feng (https://github.com/mapler);
 * Wayne Ye (https://github.com/WayneYe);
-* bendavis78 (http://github.com/bendavis78);
-* fwuzju (http://github.com/fwuzju);
-* lawrenceakka;
-* lee (loyalpartner);
-* nixon;
-* tramchamploo;
+* Wes Turner (https://github.com/westurner);
+* bendavis78 (https://github.com/bendavis78);
+* fwuzju (https://github.com/fwuzju);
+* lee (https://github.com/loyalpartner);
+* nixon (https://github.com/nixon);
+* sphaugh (https://github.com/sphaugh);
+* tramchamploo (https://github.com/tramchamploo);

README.rst

@@ -4,19 +4,32 @@
 .. image:: https://travis-ci.org/klen/python-mode.png?branch=develop
     :target: https://travis-ci.org/klen/python-mode
 
-.. image:: https://dl.dropboxusercontent.com/u/487440/reformal/donate.png
-    :target: https://www.gittip.com/klen/
-    :alt: Donate
+-----
+
+*The project needs maintainers and contributors*
+
+Actually, I have no time for support the project, so if you feel yourself as
+strong don't be hesitate to contact me.
+
+-----
+
+|
+| Src:  https://github.com/klen/python-mode
+| Homepage: https://klen.github.io/python-mode/
+| Docs: https://github.com/klen/python-mode/blob/develop/doc/pymode.txt
+|
 
 Python-mode is a vim plugin that helps you to create python code very quickly
-by utilizing libraries including pylint_, rope_, pydoc_, pyflakes_, pep8_, and
-mccabe_  for features like static analysis, refactoring, folding, completion,
+by utilizing libraries including
+`pylint`_, `rope`_, pydoc_, `pyflakes`_, `pep8`_, `autopep8`_,
+`pep257`_ and `mccabe`_
+for features like static analysis, refactoring, folding, completion,
 documentation, and more.
 
 The plugin contains all you need to develop python applications in Vim.
 
-There is no need to install pylint_, rope_ or any other Python libraries on
-your system.
+There is no need to install `pylint`_, `rope`_
+or any other `Python Libraries`_ on your system.
 
 - Support Python version 2.6+ and 3.2+
 - Syntax highlighting
@@ -97,13 +110,13 @@ Then rebuild **helptags** in vim::
 
 Debian packages
 ---------------
+|Repository URL: https://klen.github.io/python-mode/deb/
 
-Repository URL: http://klen.github.io/python-mode/deb/
 Install with commands:
 
 ::
 
-     add-apt-repository http://klen.github.io/python-mode/deb main
+     add-apt-repository https://klen.github.io/python-mode/deb main
      apt-get update
      apt-get install vim-python-mode
 
@@ -176,11 +189,139 @@ https://github.com/klen/python-mode
 Please make a pull request to `development` branch and add yourself to
 `AUTHORS`.
 
+Source Links
+===================
+- `doc/pymode.txt
+  <https://github.com/klen/python-mode/blob/develop/doc/pymode.txt>`__
+  -- ``:help pymode``
+- `plugin/pymode.vim
+  <https://github.com/klen/python-mode/blob/develop/plugin/pymode.vim>`__
+  -- python-mode VIM plugin
+- `syntax/python.vim
+  <https://github.com/klen/python-mode/blob/develop/syntax/python.vim>`__
+  -- python-mode ``python.vim`` VIM syntax
+- `syntax/pyrex.vim
+  <https://github.com/klen/python-mode/blob/develop/syntax/pyrex.vim>`__
+  -- ``pyrex.vim`` VIM syntax (pyrex, Cython)
+- `t/
+  <https://github.com/klen/python-mode/tree/develop/t>`__
+  -- ``*.vim`` more python-mode VIM configuration
+- `pymode/
+  <https://github.com/klen/python-mode/tree/develop/pymode>`__
+  -- ``*.py`` -- python-mode Python module
+- `pymode/libs/
+  <https://github.com/klen/python-mode/tree/develop/pymode/libs>`__
+  -- ``*.py`` -- `Python Libraries <#python-libraries>`__
+
+
+Python Libraries
+------------------
+Vendored Python modules are located
+mostly in
+`pymode/libs/ <https://github.com/klen/python-mode/tree/develop/pymode/libs>`__.
+
+
+======
+rope
+======
+| PyPI: https://pypi.python.org/pypi/rope
+| Src: https://github.com/python-rope/rope
+| Docs: https://github.com/python-rope/rope/blob/master/docs/overview.rst
+| Docs: https://github.com/python-rope/rope/blob/master/docs/library.rst
+
+========================
+ropemode
+========================
+| PyPI: https://pypi.python.org/pypi/ropemode
+| Src: https://github.com/python-rope/ropemode
+
+=========
+ropevim
+=========
+| PyPI: https://pypi.python.org/pypi/ropevim
+| Src: https://github.com/python-rope/ropevim
+| Docs: https://github.com/python-rope/ropevim/blob/master/doc/ropevim.txt
+
+=======
+pylama
+=======
+| PyPI: https://pypi.python.org/pypi/pylama
+| Src: https://github.com/klen/pylama
+
+========
+pylint
+========
+| PyPI: https://pypi.python.org/pypi/pylint
+| Src: https://bitbucket.org/logilab/pylint
+| Homepage: http://www.pylint.org/
+| Docs: http://docs.pylint.org/
+| Docs: http://docs.pylint.org/message-control.html
+| Docs: http://docs.pylint.org/faq.html#message-control
+| ErrCodes: http://pylint-messages.wikidot.com/all-codes
+| ErrCodes: http://pylint-messages.wikidot.com/all-messages
+
+==========
+pyflakes
+==========
+| PyPI: https://pypi.python.org/pypi/pyflakes
+| Src: https://github.com/pyflakes/pyflakes
+| ErrCodes: https://flake8.readthedocs.org/en/latest/warnings.html
+
+======
+pep8
+======
+| PyPI: https://pypi.python.org/pypi/pep8
+| Src: http://github.com/jcrocholl/pep8
+| PEP 8: http://www.python.org/dev/peps/pep-0008/
+| PEP 8: http://legacy.python.org/dev/peps/pep-0008/
+| Docs: https://pep8.readthedocs.org/en/latest/
+| Docs: https://pep8.readthedocs.org/en/latest/intro.html#configuration
+| ErrCodes: https://pep8.readthedocs.org/en/latest/intro.html#error-codes
+
+=========
+autopep8
+=========
+| PyPI: https://pypi.python.org/pypi/autopep8
+| Src: https://github.com/hhatto/autopep8
+
+=======
+pep257
+=======
+| PyPI: https://pypi.python.org/pypi/pep257
+| Src: http://github.com/GreenSteam/pep257
+| Docs: https://pep257.readthedocs.org/en/latest/
+| PEP 257: http://www.python.org/dev/peps/pep-0257/
+| ErrCodes: https://pep257.readthedocs.org/en/latest/error_codes.html
+
+=======
+mccabe
+=======
+| PyPI: https://pypi.python.org/pypi/mccabe
+| Src: https://github.com/flintwork/mccabe
+| Docs: https://en.wikipedia.org/wiki/Cyclomatic_complexity
+
+
+Vim Libraries
+---------------
+Vendored Vim modules are located mostly in ``t/``.
+
+======================
+Python syntax for vim
+======================
+| Src: http://www.hlabs.spb.ru/vim/python.vim
+
+
+=====================
+PEP8 VIM indentation
+=====================
+| Src: http://github.com/hynek/vim-python-pep8-indent
+
+
 
 Copyright
 =========
 
-Copyright © 2013 Kirill Klenov (klen_)
+Copyright © 2013-2015 Kirill Klenov (klen_)
 
 License
 =======
@@ -192,17 +333,17 @@ My address is here: "Russia, 143500, MO, Istra, pos. Severny 8-3" to "Kirill Kle
 **Thanks for support!**
 
 .. _GNU lesser general public license: http://www.gnu.org/copyleft/lesser.html
-.. _klen: http://klen.github.com/
+.. _klen: https://klen.github.com/
 .. _pydoc: http://docs.python.org/library/pydoc.html
 .. _pathogen: https://github.com/tpope/vim-pathogen
-.. _rope: https://pypi.python.org/pypi/rope
-.. _pylama: https://github.com/klen/pylama
-.. _pylint: https://bitbucket.org/logilab/pylint
-.. _pyflakes: https://pypi.python.org/pypi/pyflakes
-.. _autopep8: https://github.com/hhatto/autopep8
-.. _pep257: http://github.com/GreenSteam/pep257
-.. _mccabe: https://github.com/flintwork/mccabe
+.. _rope_: https://pypi.python.org/pypi/rope
+.. _pylama_: https://github.com/klen/pylama
+.. _pylint_: https://bitbucket.org/logilab/pylint
+.. _pyflakes_: https://pypi.python.org/pypi/pyflakes
+.. _autopep8_: https://github.com/hhatto/autopep8
+.. _pep257_: http://github.com/GreenSteam/pep257
+.. _mccabe_: https://github.com/flintwork/mccabe
 .. _pythonvim: http://www.hlabs.spb.ru/vim/python.vim
-.. _pep8: http://github.com/jcrocholl/pep8
+.. _pep8_: http://github.com/jcrocholl/pep8
 .. _pep8indent: http://github.com/hynek/vim-python-pep8-indent
 .. |logo| image:: https://raw.github.com/klen/python-mode/develop/logo.png

autoload/pymode.vim

@@ -54,7 +54,7 @@ fun! pymode#quickfix_open(onlyRecognized, maxHeight, minHeight, jumpError) "{{{
     redraw
     if numOthers > 0
         call pymode#wide_message(printf('Quickfix: %d(+%d)', numErrors, numOthers))
-    else
+    elseif numErrors > 0
         call pymode#wide_message(printf('Quickfix: %d', numErrors))
     endif
 endfunction "}}}
@@ -128,6 +128,6 @@ endfunction "}}}
 
 fun! pymode#quit() "{{{
     augroup pymode
-        au!
+        au! * <buffer>
     augroup END
 endfunction "}}}

doc/pymode.txt

@@ -628,6 +628,10 @@ Highlight "print" as a function            *'g:pymode_syntax_print_as_function'*
 >
     let g:pymode_syntax_print_as_function = 0
 
+Highlight "async/await" keywords       *'g:pymode_syntax_highlight_async_await'*
+>
+    let g:pymode_syntax_highlight_async_await = g:pymode_syntax_all
+
 Highlight '=' operator              *'g:pymode_syntax_highlight_equal_operator'*
 >
     let g:pymode_syntax_highlight_equal_operator = g:pymode_syntax_all

pymode/libs3/rope/base/fscommands.py

@@ -242,7 +242,7 @@ def read_str_coding(source):
     if not isinstance(source, str):
         source = source.decode("utf-8", "ignore")
     #TODO: change it to precompiled version
-    mex = re.search("\-\*\-\s+coding:\s+(.*?)\s+\-\*\-", source)
+    mex = re.search("\-\*\-\s+coding:\s*(.*?)\s+\-\*\-", source)
     if mex:
         return mex.group(1)
     return "utf-8"

pymode/run.py

@@ -62,7 +62,7 @@ def run_code():
     errors += [er for er in err.splitlines() if er and "<string>" not in er]
 
     env.let('l:traceback', errors[2:])
-    env.let('l:output', [s for s in output.split('\n')])
+    env.let('l:output', [s for s in output.splitlines()])
 
 
 def __prepare_lines(line1, line2):

pymode/virtualenv.py

@@ -1,6 +1,8 @@
 """ Support virtualenv in pymode. """
 
-import os.path
+import os
+import sys
+import site
 
 from .environment import env
 
@@ -25,13 +27,44 @@ def enable_virtualenv():
         activate_this = os.path.join(
             os.path.join(path, 'Scripts'), 'activate_this.py')
 
-    f = open(activate_this)
     try:
-        source = f.read()
-        exec(compile(  # noqa
-            source, activate_this, 'exec'), dict(__file__=activate_this))
-        env.message('Activate virtualenv: ' + path)
-        env.let('g:pymode_virtualenv_enabled', path)
-        return True
-    finally:
-        f.close()
+        with open(activate_this) as f:
+            source = f.read()
+            exec(compile(  # noqa
+                source, activate_this, 'exec'), dict(__file__=activate_this))
+    except IOError:
+        _activate_env_from_path(path)
+
+    env.message('Activate virtualenv: ' + path)
+    env.let('g:pymode_virtualenv_enabled', path)
+    return True
+
+
+def _activate_env_from_path(env_path):
+    """ Fix when `activate_this.py` does not exist.
+
+        For Python 3.3 and newer, a new command-line tool `pyvenv` create venv
+        will not provide 'activate_this.py'.
+    """
+    prev_sys_path = list(sys.path)
+
+    if sys.platform == 'win32':
+        site_packages_paths = [os.path.join(env_path, 'Lib', 'site-packages')]
+    else:
+        lib_path = os.path.join(env_path, 'lib')
+        site_packages_paths = [os.path.join(lib_path, lib, 'site-packages')
+                               for lib in os.listdir(lib_path)]
+    for site_packages_path in site_packages_paths:
+        site.addsitedir(site_packages_path)
+
+    sys.real_prefix = sys.prefix
+    sys.prefix = env_path
+    sys.exec_prefix = env_path
+
+    # Move the added items to the front of the path:
+    new_sys_path = []
+    for item in list(sys.path):
+        if item not in prev_sys_path:
+            new_sys_path.append(item)
+            sys.path.remove(item)
+    sys.path[:0] = new_sys_path

syntax/python.vim

@@ -16,6 +16,9 @@ call pymode#default('g:pymode_syntax_all', 1)
 
 " Highlight 'print' as function
 call pymode#default("g:pymode_syntax_print_as_function", 0)
+"
+" Highlight 'async/await' keywords
+call pymode#default("g:pymode_syntax_highlight_async_await", g:pymode_syntax_all)
 
 " Highlight '=' operator
 call pymode#default('g:pymode_syntax_highlight_equal_operator', g:pymode_syntax_all)
@@ -101,6 +104,13 @@ endif
         syn keyword pythonStatement print
     endif
 
+    if g:pymode_syntax_highlight_async_await
+        syn keyword pythonStatement async await
+        syn match pythonStatement "\<async\s\+def\>" nextgroup=pythonFunction skipwhite
+        syn match pythonStatement "\<async\s\+with\>" display
+        syn match pythonStatement "\<async\s\+for\>" nextgroup=pythonRepeat skipwhite
+    endif
+
     if g:pymode_syntax_highlight_equal_operator
         syn match pythonExtraOperator "\%(=\)"
     endif