summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-02-05 23:26:02 -0500
committerJason R. Coombs <jaraco@jaraco.com>2016-02-05 23:26:02 -0500
commitb61337d8ecf03d4eeaeaf9f4391621dfdeb02a55 (patch)
tree5ea0f6dc9805a8644e9f7a73f28db24d5ba0f1b4
parent7cc8a31dd3e21a89d0bbdfb76d065c79d6a7f39c (diff)
downloadcherrypy-b61337d8ecf03d4eeaeaf9f4391621dfdeb02a55.tar.gz
Remove sys.version_info conditional
-rw-r--r--cherrypy/test/test_core.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/cherrypy/test/test_core.py b/cherrypy/test/test_core.py
index 6ca3226d..bbeba653 100644
--- a/cherrypy/test/test_core.py
+++ b/cherrypy/test/test_core.py
@@ -9,6 +9,7 @@ import cherrypy
from cherrypy._cpcompat import IncompleteRead, itervalues, ntob
from cherrypy import _cptools, tools
from cherrypy.lib import httputil, static
+from cherrypy.test._test_decorators import ExposeExamples
favicon_path = os.path.join(os.getcwd(), localDir, "../favicon.ico")
@@ -41,10 +42,7 @@ class CoreRequestHandlingTest(helper.CPWebCase):
baseurl.exposed = True
root = Root()
-
- if sys.version_info >= (2, 5):
- from cherrypy.test._test_decorators import ExposeExamples
- root.expose_dec = ExposeExamples()
+ root.expose_dec = ExposeExamples()
class TestType(type):