cleanup cherrypy runner

1 files changed, 6 insertions, 4 deletions

diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py
index 75c648c01..8cceecbb3 100644
--- a/pyramid/scripts/pserve.py
+++ b/pyramid/scripts/pserve.py
@@ -25,6 +25,7 @@ import traceback
 from paste.deploy import loadserver
 from paste.deploy import loadapp
 
+from pyramid.compat import PY3
 from pyramid.compat import WIN
 
 from pyramid.paster import setup_logging
@@ -960,12 +961,13 @@ def cherrypy_server_runner(
     server = wsgiserver.CherryPyWSGIServer(bind_addr, app,
                                            server_name=server_name, **kwargs)
     if ssl_pem is not None:
-        import sys
-        if sys.version_info < (3, 0):
+        if not PY3:
             server.ssl_certificate = server.ssl_private_key = ssl_pem
         else:
-            wsgiserver.get_ssl_adapter_class() # creates wsgiserver.ssl_builtin as side-effect
-            server.ssl_adapter = wsgiserver.ssl_builtin.BuiltinSSLAdapter(ssl_pem, ssl_pem)
+            # creates wsgiserver.ssl_builtin as side-effect
+            wsgiserver.get_ssl_adapter_class()
+            server.ssl_adapter = wsgiserver.ssl_builtin.BuiltinSSLAdapter(
+                ssl_pem, ssl_pem)
 
     if protocol_version:
         server.protocol = protocol_version