summaryrefslogtreecommitdiff
path: root/tests/util.py
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-01-19 10:32:12 +0100
committerGeorg Brandl <georg@python.org>2014-01-19 10:32:12 +0100
commit69dab54d89926f2fc8ce1febbd2288d09531cdb0 (patch)
tree8ea5d51a670a4e9430a9f57e5eca16cfe994bd20 /tests/util.py
parent604ea875698727d3c1d83317130af0fff5bb5ab8 (diff)
parent59b355edaa4f17aff910bf2371526d5ce46fb648 (diff)
downloadsphinx-69dab54d89926f2fc8ce1febbd2288d09531cdb0.tar.gz
merge with stable
Diffstat (limited to 'tests/util.py')
-rw-r--r--tests/util.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/util.py b/tests/util.py
index 4ba89030..a2f345bf 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -13,12 +13,7 @@ import tempfile
import shutil
import re
from codecs import open
-
-try:
- from functools import wraps
-except ImportError:
- # functools is new in 2.4
- wraps = lambda f: (lambda w: w)
+from functools import wraps
from sphinx import application
from sphinx.theming import Theme