summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatth?us G. Chajdas <dev@anteru.net>2018-11-24 17:49:57 +0100
committerMatth?us G. Chajdas <dev@anteru.net>2018-11-24 17:49:57 +0100
commit60afd6c7897f2e0b5326645efd48c9b70db744d8 (patch)
treee591f9d9050382b03f67172c14c1eafcbf4804b3
parentfd0d9128ffcbb362ea08118c1b6fbb74590e8a60 (diff)
downloadpygments-60afd6c7897f2e0b5326645efd48c9b70db744d8.tar.gz
Fix the tests, and enable them for Python 2.7, 3.5, 3.6, 3.7.
Updated the documentation as well to make clear which Python versions are officially supported.
-rw-r--r--doc/faq.rst4
-rw-r--r--pygments/lexers/xorg.py4
-rw-r--r--tox.ini2
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/faq.rst b/doc/faq.rst
index f375828b..172929e0 100644
--- a/doc/faq.rst
+++ b/doc/faq.rst
@@ -35,8 +35,8 @@ and in this case, source code!
What are the system requirements?
---------------------------------
-Pygments only needs a standard Python install, version 2.6 or higher or version
-3.3 or higher for Python 3. No additional libraries are needed.
+Pygments only needs a standard Python install, version 2.7 or higher or version
+3.5 or higher for Python 3. No additional libraries are needed.
How can I use Pygments?
-----------------------
diff --git a/pygments/lexers/xorg.py b/pygments/lexers/xorg.py
index 89475a80..e6383b30 100644
--- a/pygments/lexers/xorg.py
+++ b/pygments/lexers/xorg.py
@@ -26,8 +26,8 @@ class XorgLexer(RegexLexer):
(r'\s+', Text),
(r'#.*$', Comment),
- (r'((|Sub)Section)(\s+)("\w+")',
- bygroups(String.Escape, String.Escape, Text, String.Escape)),
+ (r'((?:Sub)?Section)(\s+)("\w+")',
+ bygroups(String.Escape, Text, String.Escape)),
(r'(End(|Sub)Section)', String.Escape),
(r'(\w+)(\s+)([^\n#]+)',
diff --git a/tox.ini b/tox.ini
index 8a33f99c..2c63c292 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26, py27, py33, py34
+envlist = py27, py35, py36, py37
[testenv]
deps =
nose