From: JinWang An Date: Tue, 5 Jan 2021 03:17:07 +0000 (+0900) Subject: Imported Upstream version 2.1.2 X-Git-Tag: upstream/2.1.2^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01431ae42e94e5ede1d56850b55e0f55f42da347;p=platform%2Fupstream%2Fpython3-pygments.git Imported Upstream version 2.1.2 --- diff --git a/.hgignore b/.hgignore new file mode 100644 index 0000000..850baf1 --- /dev/null +++ b/.hgignore @@ -0,0 +1,19 @@ +syntax: glob +*.egg +*.pyc +*.pyo +.*.sw[op] +.idea/ +.ropeproject +.project +.tags +.tox +Pygments.egg-info/* +TAGS +build/* +dist/* +doc/_build +TAGS +tests/.coverage +tests/cover +tests/examplefiles/output diff --git a/.hgtags b/.hgtags new file mode 100644 index 0000000..a7e6537 --- /dev/null +++ b/.hgtags @@ -0,0 +1,30 @@ +634420aa4221cc1eb2b3753bd571166bd9e611d4 0.9 +942ecbb5c84ca5d57ae82f5697775973f4e12717 0.10 +63632d0340958d891176db20fe9a32a56abcd5ea 0.11 +13834ec94d2c5a90a68bc2c2a327abd962c486bc 0.11.1 +a5748745272afffd725570e068a560d46e28dc1f 1.0 +5a794a620dc711a219722a7af94d9d2e95cda26d 1.1 +dd81c35efd95292de4965153c66c8bbfe435f1c4 1.1.1 +e7691aa4f473a2cdaa2e5b7bfed8aec196719aca 0.5.1 +6f53364d63ddb8bd9532bb6ea402e3af05275b03 0.5 +11efe99c11e601071c3a77910b9fca769de66fbf 0.6 +99df0a7404d168b05626ffced6fd16edcf58c145 0.7 +d0b08fd569d3d9dafec4c045a7d8876442b3ef64 0.7.1 +1054522d1dda9c7899516ead3e65e5e363fdf30d 0.8 +066e56d8f5caa31e15386fff6f938bedd85a8732 0.8.1 +bae0833cae75e5a641abe3c4b430fa384cd9d258 1.2 +f6e5acee4f761696676e05a9112c91a5a5670b49 1.2.1 +580c5ce755486bc92c79c50f80cfc79924e15140 1.2.2 +c62867700c9e98cc2988c62f298ec54cee9b6927 1.3 +3a3846c2503db85bb70a243c8bc702629c4bce57 1.3.1 +8ad6d35dd2ab0530a1e2c088ab7fe0e00426b5f9 1.4 +eff3aee4abff2b72564ddfde77fcc82adbba52ad 1.5 +2c262bfc66b05a8aecc1109c3acc5b9447a5213c 1.6rc1 +7c962dcb484cb73394aec7f41709940340dc8a9c 1.6 +da509a68ea620bbb8ee3f5d5cf7761375d8f4451 2.0rc1 +ed3206a773e9cb90a0edeabee8ef6b56b5b9a53c 2.0 +94e1e056c92d97e3a54759f9216e8deff22efbdd 2.0.1 +142a870bf0f1822414649ae26f433b112a5c92d5 2.0.2 +34530db252d35d7ef57a8dbb9fce7bcc46f6ba6b 2.1 +2935c3a59672e8ae74ffb7ea66ea6567f49782f6 2.1.1 +8e7ebc56153cf899067333bff4f15ae98758a2e1 2.1.2 diff --git a/CHANGES b/CHANGES index fbe7bc3..aacfef8 100644 --- a/CHANGES +++ b/CHANGES @@ -6,6 +6,13 @@ Issue numbers refer to the tracker at pull request numbers to the requests at . +Version 2.1.2 +------------- +(released Feb 29, 2016) + +- Fixed Python 3 regression in image formatter (#1215) +- Fixed regression in Bash lexer (PR#562) + Version 2.1.1 ------------- diff --git a/PKG-INFO b/PKG-INFO index f37aa68..bf82a02 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: Pygments -Version: 2.1.1 +Version: 2.1.2 Summary: Pygments is a syntax highlighting package written in Python. Home-page: http://pygments.org/ Author: Georg Brandl diff --git a/Pygments.egg-info/PKG-INFO b/Pygments.egg-info/PKG-INFO index f37aa68..bf82a02 100644 --- a/Pygments.egg-info/PKG-INFO +++ b/Pygments.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: Pygments -Version: 2.1.1 +Version: 2.1.2 Summary: Pygments is a syntax highlighting package written in Python. Home-page: http://pygments.org/ Author: Georg Brandl diff --git a/Pygments.egg-info/SOURCES.txt b/Pygments.egg-info/SOURCES.txt index 169231f..5155bcc 100644 --- a/Pygments.egg-info/SOURCES.txt +++ b/Pygments.egg-info/SOURCES.txt @@ -1,3 +1,5 @@ +.hgignore +.hgtags AUTHORS CHANGES LICENSE @@ -7,8 +9,10 @@ README.rst TODO ez_setup.py pygmentize +requirements.txt setup.cfg setup.py +tox.ini Pygments.egg-info/PKG-INFO Pygments.egg-info/SOURCES.txt Pygments.egg-info/dependency_links.txt diff --git a/pygments/__init__.py b/pygments/__init__.py index 0c17500..45c53b8 100644 --- a/pygments/__init__.py +++ b/pygments/__init__.py @@ -26,7 +26,7 @@ :license: BSD, see LICENSE for details. """ -__version__ = '2.1.1' +__version__ = '2.1.2' __docformat__ = 'restructuredtext' __all__ = ['lex', 'format', 'highlight'] diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py index c7b8e81..cc95ce2 100644 --- a/pygments/formatters/img.py +++ b/pygments/formatters/img.py @@ -83,7 +83,7 @@ class FontManager(object): if proc.returncode == 0: lines = stdout.splitlines() for line in lines: - if line.startswith('Fontconfig warning:'): + if line.startswith(b'Fontconfig warning:'): continue path = line.decode().strip().strip(':') if path: diff --git a/pygments/lexers/shell.py b/pygments/lexers/shell.py index 4145939..6a3b381 100644 --- a/pygments/lexers/shell.py +++ b/pygments/lexers/shell.py @@ -50,7 +50,7 @@ class BashLexer(RegexLexer): (r'\$\(\(', Keyword, 'math'), (r'\$\(', Keyword, 'paren'), (r'\$\{#?', String.Interpol, 'curly'), - (r'\$[a-fA-F_][a-fA-F0-9_]*', Name.Variable), # user variable + (r'\$[a-zA-Z_][a-zA-Z0-9_]*', Name.Variable), # user variable (r'\$(?:\d+|[#$?!_*@-])', Name.Variable), # builtin (r'\$', Text), ], diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..4754a9d --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +coverage +nose +pyflakes +pylint +tox diff --git a/setup.py b/setup.py index b15e0bc..03dcffb 100755 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ else: setup( name = 'Pygments', - version = '2.1.1', + version = '2.1.2', url = 'http://pygments.org/', license = 'BSD License', author = 'Georg Brandl', diff --git a/tests/test_examplefiles.pyc b/tests/test_examplefiles.pyc index 0de62e1..2681df5 100644 Binary files a/tests/test_examplefiles.pyc and b/tests/test_examplefiles.pyc differ diff --git a/tests/test_html_formatter.pyc b/tests/test_html_formatter.pyc index e490920..dcc3014 100644 Binary files a/tests/test_html_formatter.pyc and b/tests/test_html_formatter.pyc differ diff --git a/tests/test_java.pyc b/tests/test_java.pyc index 09c50a8..952d8d5 100644 Binary files a/tests/test_java.pyc and b/tests/test_java.pyc differ diff --git a/tests/test_lexers_other.pyc b/tests/test_lexers_other.pyc index a6e2c14..a87d5ef 100644 Binary files a/tests/test_lexers_other.pyc and b/tests/test_lexers_other.pyc differ diff --git a/tests/test_terminal_formatter.pyc b/tests/test_terminal_formatter.pyc index 0bd6ab3..50ff9c6 100644 Binary files a/tests/test_terminal_formatter.pyc and b/tests/test_terminal_formatter.pyc differ diff --git a/tests/test_token.pyc b/tests/test_token.pyc index 3686dd6..1b5aa3f 100644 Binary files a/tests/test_token.pyc and b/tests/test_token.pyc differ diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..8a33f99 --- /dev/null +++ b/tox.ini @@ -0,0 +1,7 @@ +[tox] +envlist = py26, py27, py33, py34 +[testenv] +deps = + nose + coverage +commands = python -d tests/run.py {posargs}