summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cherrypy/process/wspbus.py2
-rwxr-xr-xcherrypy/test/test_session.py2
-rw-r--r--cherrypy/test/test_static.py2
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
-rw-r--r--tests/dist-check.py8
6 files changed, 9 insertions, 9 deletions
diff --git a/cherrypy/process/wspbus.py b/cherrypy/process/wspbus.py
index 36f5073d..c36c0048 100644
--- a/cherrypy/process/wspbus.py
+++ b/cherrypy/process/wspbus.py
@@ -483,7 +483,7 @@ class Bus(object):
"""There's no such module exist"""
raise AttributeError(
"{} doesn't seem to be a module "
- "accessible by current user".format(original_module))
+ 'accessible by current user'.format(original_module))
del _argv[m_ind:m_ind + 2] # remove `-m -m`
# ... and substitute it with the original module path:
_argv.insert(m_ind, original_module)
diff --git a/cherrypy/test/test_session.py b/cherrypy/test/test_session.py
index b6cef108..e5602562 100755
--- a/cherrypy/test/test_session.py
+++ b/cherrypy/test/test_session.py
@@ -294,7 +294,7 @@ class SessionTest(helper.CPWebCase):
os.unlink(path)
self.getPage('/testStr', self.cookies)
- @pytest.mark.xfail(reason="#1557")
+ @pytest.mark.xfail(reason='#1557')
def test_5_Error_paths(self):
self.getPage('/unknown/page')
self.assertErrorPage(404, "The path '/unknown/page' was not found.")
diff --git a/cherrypy/test/test_static.py b/cherrypy/test/test_static.py
index f8663655..26358035 100644
--- a/cherrypy/test/test_static.py
+++ b/cherrypy/test/test_static.py
@@ -374,7 +374,7 @@ class StaticTest(helper.CPWebCase):
platform.system() == 'Windows' and
sys.version_info < (3,)
)
- @pytest.mark.xfail(py27_on_windows, reason="#1544")
+ @pytest.mark.xfail(py27_on_windows, reason='#1544')
def test_unicode(self):
with self.unicode_file():
url = ntou('/static/Слава Україні.html', 'utf-8')
diff --git a/docs/conf.py b/docs/conf.py
index cb9a753c..a096da3e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,7 +18,7 @@ import datetime
import importlib
import subprocess
-assert sys.version_info > (3,), "Python 3 required to build docs"
+assert sys.version_info > (3,), 'Python 3 required to build docs'
def try_import(mod_name):
try:
diff --git a/setup.py b/setup.py
index 9041a820..009d3cba 100644
--- a/setup.py
+++ b/setup.py
@@ -107,7 +107,7 @@ setup_params = dict(
url=url,
license=cp_license,
packages=packages,
- entry_points={"console_scripts": ["cherryd = cherrypy.__main__:run"]},
+ entry_points={'console_scripts': ['cherryd = cherrypy.__main__:run']},
include_package_data=True,
install_requires=install_requires,
extras_require=extras_require,
diff --git a/tests/dist-check.py b/tests/dist-check.py
index e6cdbcdd..e4d614f0 100644
--- a/tests/dist-check.py
+++ b/tests/dist-check.py
@@ -25,14 +25,14 @@ import pytest
'tutorial/custom_error.html',
])
def data_file_path(request):
- "generates data file paths expected to be found in the package"
+ 'generates data file paths expected to be found in the package'
return request.param
-@pytest.fixture(autouse=True, scope="session")
+@pytest.fixture(autouse=True, scope='session')
def remove_sys_path_0():
- "pytest adds cwd to sys.path[0]"
- print("removing", sys.path[0])
+ 'pytest adds cwd to sys.path[0]'
+ print('removing', sys.path[0])
del sys.path[0]
assert 'cherrypy' not in sys.modules