diff options
| -rwxr-xr-x[-rw-r--r--] | ez_setup.py | 2 | ||||
| -rw-r--r-- | pygments/__init__.py | 3 | ||||
| -rw-r--r-- | pygments/lexers/agile.py | 3 | ||||
| -rw-r--r-- | pygments/lexers/parsers.py | 3 | ||||
| -rwxr-xr-x | setup.py | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/ez_setup.py b/ez_setup.py index d24e845e..e33744ba 100644..100755 --- a/ez_setup.py +++ b/ez_setup.py @@ -92,7 +92,7 @@ def use_setuptools( try: import pkg_resources except ImportError: - return do_download() + return do_download() try: pkg_resources.require("setuptools>="+version); return except pkg_resources.VersionConflict, e: diff --git a/pygments/__init__.py b/pygments/__init__.py index 2e63f988..41d482d2 100644 --- a/pygments/__init__.py +++ b/pygments/__init__.py @@ -18,7 +18,8 @@ The `Pygments tip`_ is installable with ``easy_install Pygments==dev``. - .. _Pygments tip: http://dev.pocoo.org/hg/pygments-main/archive/tip.tar.gz#egg=Pygments-dev + .. _Pygments tip: + http://dev.pocoo.org/hg/pygments-main/archive/tip.tar.gz#egg=Pygments-dev :copyright: Copyright 2006-2009 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. diff --git a/pygments/lexers/agile.py b/pygments/lexers/agile.py index a6c21a10..1a57c737 100644 --- a/pygments/lexers/agile.py +++ b/pygments/lexers/agile.py @@ -127,7 +127,8 @@ class PythonLexer(RegexLexer): ('[a-zA-Z_][a-zA-Z0-9_]*', Name.Class, '#pop') ], 'import': [ - (r'((?:\s|\\\s)+)(as)((?:\s|\\\s)+)', bygroups(Text, Keyword.Namespace, Text)), + (r'((?:\s|\\\s)+)(as)((?:\s|\\\s)+)', + bygroups(Text, Keyword.Namespace, Text)), (r'[a-zA-Z_][a-zA-Z0-9_.]*', Name.Namespace), (r'(\s*)(,)(\s*)', bygroups(Text, Operator, Text)), (r'', Text, '#pop') # all else: go back diff --git a/pygments/lexers/parsers.py b/pygments/lexers/parsers.py index f967132a..5d7118aa 100644 --- a/pygments/lexers/parsers.py +++ b/pygments/lexers/parsers.py @@ -440,7 +440,8 @@ class AntlrLexer(RegexLexer): include('whitespace'), include('comments'), (r'{', Punctuation), - (r'(' + _TOKEN_REF + r')(\s*)(=)?(\s*)(' + _STRING_LITERAL + ')?(\s*)(;)', + (r'(' + _TOKEN_REF + r')(\s*)(=)?(\s*)(' + _STRING_LITERAL + + ')?(\s*)(;)', bygroups(Name.Label, Whitespace, Punctuation, Whitespace, String, Whitespace, Punctuation)), (r'}', Punctuation, '#pop'), @@ -19,7 +19,8 @@ The `Pygments tip`_ is installable with ``easy_install Pygments==dev``. - .. _Pygments tip: http://dev.pocoo.org/hg/pygments-main/archive/tip.tar.gz#egg=Pygments-dev + .. _Pygments tip: + http://dev.pocoo.org/hg/pygments-main/archive/tip.tar.gz#egg=Pygments-dev :copyright: Copyright 2006-2009 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. |