Merge remote-tracking branch 'upstream/master'

CHANGES.txt

@@ -1,3 +1,8 @@
+Revision 3.3.7 (2014-12-27):
+
+    - Add support for Python 3 non-ASCII decorator names.
+      Patch by Victor Salgado
+
 Revision 3.3.6 (2013-11-18):
 
     - Highlight 'yield from' statement introduced in Python 3.3. Reported by
@@ -6,10 +11,10 @@ Revision 3.3.6 (2013-11-18):
 Revision 3.3.5 (2013-08-31):
 
     - Highlight 'import', 'from' and 'as' as include statements.
-      Patch by pydave at GitHub.
+      Patch by David Briscoe
     - Added new option 'python_highlight_file_headers_as_comments' (disabled by
       default) to highlight shebang and coding file headers as comments.
-      Proposed by pydave at GitHub.
+      Proposed by David Briscoe.
 
 Revision 3.3.4 (2013-08-11):
 

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2002-2014 Dmitry Vasiliev <dima@hlabs.org>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.rst

@@ -130,14 +130,15 @@ Contributors
 
 List of the contributors in alphabetical order:
 
-- Andrea Riciputi
+- `Andrea Riciputi <https://github.com/mrrech>`_
 - Anton Butanaev
 - Caleb Adamantine
-- Elizabeth Myers
-- Jeroen Ruigrok van der Werven
-- John Eikenberry
-- Marc Weber
-- Pedro Algarvio
-- pydave at GitHub
-- Will Gray
-- Yuri Habrusiev
+- `David Briscoe <https://github.com/idbrii>`_
+- `Elizabeth Myers <https://github.com/Elizafox>`_
+- `Jeroen Ruigrok van der Werven <https://github.com/ashemedai>`_
+- `John Eikenberry <https://github.com/eikenb>`_
+- `Marc Weber <https://github.com/MarcWeber>`_
+- `Pedro Algarvio <https://github.com/s0undt3ch>`_
+- `Victor Salgado <https://github.com/mcsalgado>`_
+- `Will Gray <https://github.com/graywh>`_
+- `Yuri Habrusiev <https://github.com/yuriihabrusiev>`_

syntax/python.vim

@@ -2,9 +2,9 @@
 " Language:     Python
 " Maintainer:   Dmitry Vasiliev <dima at hlabs dot org>
 " URL:          https://github.com/hdima/python-syntax
-" Last Change:  2013-11-18
+" Last Change:  2014-12-27
 " Filenames:    *.py
-" Version:      3.3.6
+" Version:      3.3.7
 "
 " Based on python.vim (from Vim 6.1 distribution)
 " by Neil Schemenauer <nas at python dot ca>
@@ -25,12 +25,13 @@
 "   Andrea Riciputi
 "   Anton Butanaev
 "   Caleb Adamantine
+"   David Briscoe
 "   Elizabeth Myers
 "   Jeroen Ruigrok van der Werven
 "   John Eikenberry
 "   Marc Weber
 "   Pedro Algarvio
-"   pydave at GitHub
+"   Victor Salgado
 "   Will Gray
 "   Yuri Habrusiev
 "
@@ -179,7 +180,11 @@ endif
 "
 
 syn match   pythonDecorator	"@" display nextgroup=pythonDottedName skipwhite
-syn match   pythonDottedName "[a-zA-Z_][a-zA-Z0-9_]*\%(\.[a-zA-Z_][a-zA-Z0-9_]*\)*" display contained
+if s:Python2Syntax()
+  syn match   pythonDottedName "[a-zA-Z_][a-zA-Z0-9_]*\%(\.[a-zA-Z_][a-zA-Z0-9_]*\)*" display contained
+else
+  syn match   pythonDottedName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\%(\.\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\)*" display contained
+endif
 syn match   pythonDot        "\." display containedin=pythonDottedName
 
 "

test.py

@@ -51,6 +51,8 @@ RuntimeWarning FutureWarning ImportWarning UnicodeWarning
 
 @ decoratorname
 @ object.__init__(arg1, arg2)
+@ декоратор
+@ декоратор.décorateur
 
 # Numbers