summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSviatoslav Sydorenko <wk@sydorenko.org.ua>2022-02-01 19:42:20 +0100
committerSviatoslav Sydorenko <wk@sydorenko.org.ua>2022-02-01 19:42:20 +0100
commitc85b9a2befd40c6fcea878dc244293c3316575b0 (patch)
treea038f517dc5c864b9b32ba5d7c8f65dfa97ec6df
parent02d19e7d69d3cb536a279fea059f3a2d76be1e2c (diff)
parent07aec3c90326e537613e5a77584df201ac5fdb1a (diff)
downloadcherrypy-git-c85b9a2befd40c6fcea878dc244293c3316575b0.tar.gz
Merge PR #1932
Diffstat
-rw-r--r--.github/CONTRIBUTING.rst2
-rw-r--r--.github/SUPPORT.rst2
-rw-r--r--LICENSE.md2
-rw-r--r--README.rst2
-rw-r--r--cherrypy/_cperror.py2
-rw-r--r--cherrypy/_cprequest.py4
-rw-r--r--cherrypy/test/modfastcgi.py2
-rw-r--r--cherrypy/test/modfcgid.py2
-rw-r--r--cherrypy/test/modpy.py2
-rw-r--r--cherrypy/test/modwsgi.py2
-rw-r--r--cherrypy/test/test_auth_basic.py2
-rw-r--r--cherrypy/test/test_auth_digest.py2
-rw-r--r--cherrypy/test/test_encoding.py2
-rw-r--r--cherrypy/test/test_logging.py4
-rw-r--r--cherrypy/test/test_request_obj.py6
-rw-r--r--cherrypy/test/test_tutorials.py2
-rw-r--r--cherrypy/tutorial/tut04_complex_site.py4
-rw-r--r--docs/conf.py2
-rw-r--r--docs/contribute.rst2
-rw-r--r--docs/index.rst2
-rw-r--r--man/cherryd.12
21 files changed, 26 insertions, 26 deletions
diff --git a/.github/CONTRIBUTING.rst b/.github/CONTRIBUTING.rst
index dd21f753..999f1af6 100644
--- a/.github/CONTRIBUTING.rst
+++ b/.github/CONTRIBUTING.rst
@@ -28,5 +28,5 @@ python version, and any other related software versions.
Also
----
-See `Contributing <https://docs.cherrypy.org/en/latest/contribute.html>`_ in
+See `Contributing <https://docs.cherrypy.dev/en/latest/contribute.html>`_ in
the docs.
diff --git a/.github/SUPPORT.rst b/.github/SUPPORT.rst
index 1c31c242..618792f5 100644
--- a/.github/SUPPORT.rst
+++ b/.github/SUPPORT.rst
@@ -9,7 +9,7 @@ I have a question
-----------------
If you have a question and cannot find an answer for it in issues or the
-the `documentation <http://docs.cherrypy.org/en/latest/>`__, `please
+the `documentation <http://docs.cherrypy.dev/en/latest/>`__, `please
create an issue <https://github.com/cherrypy/cherrypy/issues/new>`__.
Questions and their answers have great value for the community, and a
diff --git a/LICENSE.md b/LICENSE.md
index 96b86645..ce28cf8f 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright © 2004-2019, CherryPy Team (team@cherrypy.org)
+Copyright © 2004-2019, CherryPy Team (team@cherrypy.dev)
All rights reserved.
diff --git a/README.rst b/README.rst
index 9f507911..d7b4b247 100644
--- a/README.rst
+++ b/README.rst
@@ -14,7 +14,7 @@
.. image:: https://readthedocs.org/projects/cherrypy/badge/?version=latest
- :target: https://docs.cherrypy.org/en/latest/?badge=latest
+ :target: https://docs.cherrypy.dev/en/latest/?badge=latest
.. image:: https://img.shields.io/badge/StackOverflow-CherryPy-blue.svg
:target: https://stackoverflow.com/questions/tagged/cheroot+or+cherrypy
diff --git a/cherrypy/_cperror.py b/cherrypy/_cperror.py
index ebf1dcf6..f6ff2913 100644
--- a/cherrypy/_cperror.py
+++ b/cherrypy/_cperror.py
@@ -466,7 +466,7 @@ _HTTPErrorTemplate = '''<!DOCTYPE html PUBLIC
<pre id="traceback">%(traceback)s</pre>
<div id="powered_by">
<span>
- Powered by <a href="http://www.cherrypy.org">CherryPy %(version)s</a>
+ Powered by <a href="http://www.cherrypy.dev">CherryPy %(version)s</a>
</span>
</div>
</body>
diff --git a/cherrypy/_cprequest.py b/cherrypy/_cprequest.py
index 9b86bd67..b380bb75 100644
--- a/cherrypy/_cprequest.py
+++ b/cherrypy/_cprequest.py
@@ -169,7 +169,7 @@ def request_namespace(k, v):
def response_namespace(k, v):
"""Attach response attributes declared in config."""
# Provides config entries to set default response headers
- # http://cherrypy.org/ticket/889
+ # http://cherrypy.dev/ticket/889
if k[:8] == 'headers.':
cherrypy.serving.response.headers[k.split('.', 1)[1]] = v
else:
@@ -252,7 +252,7 @@ class Request(object):
The query component of the Request-URI, a string of information to be
interpreted by the resource. The query portion of a URI follows the
path component, and is separated by a '?'. For example, the URI
- 'http://www.cherrypy.org/wiki?a=3&b=4' has the query component,
+ 'http://www.cherrypy.dev/wiki?a=3&b=4' has the query component,
'a=3&b=4'."""
query_string_encoding = 'utf8'
diff --git a/cherrypy/test/modfastcgi.py b/cherrypy/test/modfastcgi.py
index 0c6d01e2..16927d3c 100644
--- a/cherrypy/test/modfastcgi.py
+++ b/cherrypy/test/modfastcgi.py
@@ -14,7 +14,7 @@ KNOWN BUGS
1. Apache processes Range headers automatically; CherryPy's truncated
output is then truncated again by Apache. See test_core.testRanges.
- This was worked around in http://www.cherrypy.org/changeset/1319.
+ This was worked around in http://www.cherrypy.dev/changeset/1319.
2. Apache does not allow custom HTTP methods like CONNECT as per the spec.
See test_core.testHTTPMethods.
3. Max request header and body settings do not work with Apache.
diff --git a/cherrypy/test/modfcgid.py b/cherrypy/test/modfcgid.py
index ea373004..6dd48a94 100644
--- a/cherrypy/test/modfcgid.py
+++ b/cherrypy/test/modfcgid.py
@@ -14,7 +14,7 @@ KNOWN BUGS
1. Apache processes Range headers automatically; CherryPy's truncated
output is then truncated again by Apache. See test_core.testRanges.
- This was worked around in http://www.cherrypy.org/changeset/1319.
+ This was worked around in http://www.cherrypy.dev/changeset/1319.
2. Apache does not allow custom HTTP methods like CONNECT as per the spec.
See test_core.testHTTPMethods.
3. Max request header and body settings do not work with Apache.
diff --git a/cherrypy/test/modpy.py b/cherrypy/test/modpy.py
index 024453e9..f4f68523 100644
--- a/cherrypy/test/modpy.py
+++ b/cherrypy/test/modpy.py
@@ -15,7 +15,7 @@ KNOWN BUGS
1. Apache processes Range headers automatically; CherryPy's truncated
output is then truncated again by Apache. See test_core.testRanges.
- This was worked around in http://www.cherrypy.org/changeset/1319.
+ This was worked around in http://www.cherrypy.dev/changeset/1319.
2. Apache does not allow custom HTTP methods like CONNECT as per the spec.
See test_core.testHTTPMethods.
3. Max request header and body settings do not work with Apache.
diff --git a/cherrypy/test/modwsgi.py b/cherrypy/test/modwsgi.py
index 24c72684..c3216284 100644
--- a/cherrypy/test/modwsgi.py
+++ b/cherrypy/test/modwsgi.py
@@ -11,7 +11,7 @@ KNOWN BUGS
1. Apache processes Range headers automatically; CherryPy's truncated
output is then truncated again by Apache. See test_core.testRanges.
- This was worked around in http://www.cherrypy.org/changeset/1319.
+ This was worked around in http://www.cherrypy.dev/changeset/1319.
2. Apache does not allow custom HTTP methods like CONNECT as per the spec.
See test_core.testHTTPMethods.
3. Max request header and body settings do not work with Apache.
diff --git a/cherrypy/test/test_auth_basic.py b/cherrypy/test/test_auth_basic.py
index d7e69a9b..f178f8f9 100644
--- a/cherrypy/test/test_auth_basic.py
+++ b/cherrypy/test/test_auth_basic.py
@@ -1,4 +1,4 @@
-# This file is part of CherryPy <http://www.cherrypy.org/>
+# This file is part of CherryPy <http://www.cherrypy.dev/>
# -*- coding: utf-8 -*-
# vim:ts=4:sw=4:expandtab:fileencoding=utf-8
diff --git a/cherrypy/test/test_auth_digest.py b/cherrypy/test/test_auth_digest.py
index 745f89e6..4b7b5298 100644
--- a/cherrypy/test/test_auth_digest.py
+++ b/cherrypy/test/test_auth_digest.py
@@ -1,4 +1,4 @@
-# This file is part of CherryPy <http://www.cherrypy.org/>
+# This file is part of CherryPy <http://www.cherrypy.dev/>
# -*- coding: utf-8 -*-
# vim:ts=4:sw=4:expandtab:fileencoding=utf-8
diff --git a/cherrypy/test/test_encoding.py b/cherrypy/test/test_encoding.py
index 882d7a5b..6075103d 100644
--- a/cherrypy/test/test_encoding.py
+++ b/cherrypy/test/test_encoding.py
@@ -46,7 +46,7 @@ class EncodingTests(helper.CPWebCase):
# any part which is unicode (even ascii), the response
# should not fail.
cherrypy.response.cookie['candy'] = 'bar'
- cherrypy.response.cookie['candy']['domain'] = 'cherrypy.org'
+ cherrypy.response.cookie['candy']['domain'] = 'cherrypy.dev'
cherrypy.response.headers[
'Some-Header'] = 'My d\xc3\xb6g has fleas'
cherrypy.response.headers[
diff --git a/cherrypy/test/test_logging.py b/cherrypy/test/test_logging.py
index 5308fb72..2d4aa56f 100644
--- a/cherrypy/test/test_logging.py
+++ b/cherrypy/test/test_logging.py
@@ -113,7 +113,7 @@ def test_normal_return(log_tracker, server):
resp = requests.get(
'http://%s:%s/as_string' % (host, port),
headers={
- 'Referer': 'http://www.cherrypy.org/',
+ 'Referer': 'http://www.cherrypy.dev/',
'User-Agent': 'Mozilla/5.0',
},
)
@@ -135,7 +135,7 @@ def test_normal_return(log_tracker, server):
log_tracker.assertLog(
-1,
'] "GET /as_string HTTP/1.1" 200 %s '
- '"http://www.cherrypy.org/" "Mozilla/5.0"'
+ '"http://www.cherrypy.dev/" "Mozilla/5.0"'
% content_length,
)
diff --git a/cherrypy/test/test_request_obj.py b/cherrypy/test/test_request_obj.py
index 31023e8f..3aaa8e81 100644
--- a/cherrypy/test/test_request_obj.py
+++ b/cherrypy/test/test_request_obj.py
@@ -342,7 +342,7 @@ class RequestObjectTests(helper.CPWebCase):
self.assertBody('/pathinfo/foo/bar')
def testAbsoluteURIPathInfo(self):
- # http://cherrypy.org/ticket/1061
+ # http://cherrypy.dev/ticket/1061
self.getPage('http://localhost/pathinfo/foo/bar')
self.assertBody('/pathinfo/foo/bar')
@@ -375,10 +375,10 @@ class RequestObjectTests(helper.CPWebCase):
# Make sure that encoded = and & get parsed correctly
self.getPage(
- '/params/code?url=http%3A//cherrypy.org/index%3Fa%3D1%26b%3D2')
+ '/params/code?url=http%3A//cherrypy.dev/index%3Fa%3D1%26b%3D2')
self.assertBody('args: %s kwargs: %s' %
(('code',),
- [('url', ntou('http://cherrypy.org/index?a=1&b=2'))]))
+ [('url', ntou('http://cherrypy.dev/index?a=1&b=2'))]))
# Test coordinates sent by <img ismap>
self.getPage('/params/ismap?223,114')
diff --git a/cherrypy/test/test_tutorials.py b/cherrypy/test/test_tutorials.py
index 39ca4d6f..d4835a90 100644
--- a/cherrypy/test/test_tutorials.py
+++ b/cherrypy/test/test_tutorials.py
@@ -78,7 +78,7 @@ class TutorialTest(helper.CPWebCase):
<ul>
<li><a href="http://del.icio.us">del.icio.us</a></li>
- <li><a href="http://www.cherrypy.org">CherryPy</a></li>
+ <li><a href="http://www.cherrypy.dev">CherryPy</a></li>
</ul>
<p>[<a href="../">Return to links page</a>]</p>'''
diff --git a/cherrypy/tutorial/tut04_complex_site.py b/cherrypy/tutorial/tut04_complex_site.py
index 3caa1775..fe04054f 100644
--- a/cherrypy/tutorial/tut04_complex_site.py
+++ b/cherrypy/tutorial/tut04_complex_site.py
@@ -53,7 +53,7 @@ class LinksPage:
<ul>
<li>
- <a href="http://www.cherrypy.org">The CherryPy Homepage</a>
+ <a href="http://www.cherrypy.dev">The CherryPy Homepage</a>
</li>
<li>
<a href="http://www.python.org">The Python Homepage</a>
@@ -77,7 +77,7 @@ class ExtraLinksPage:
<ul>
<li><a href="http://del.icio.us">del.icio.us</a></li>
- <li><a href="http://www.cherrypy.org">CherryPy</a></li>
+ <li><a href="http://www.cherrypy.dev">CherryPy</a></li>
</ul>
<p>[<a href="../">Return to links page</a>]</p>'''
diff --git a/docs/conf.py b/docs/conf.py
index 11129319..480edef4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -106,7 +106,7 @@ extlinks = {
intersphinx_mapping = {
'python': ('https://docs.python.org/3', None),
- 'cheroot': ('https://cheroot.cherrypy.org/en/latest/', None),
+ 'cheroot': ('https://cheroot.cherrypy.dev/en/latest/', None),
'pytest-docs': ('https://docs.pytest.org/en/latest/', None),
}
diff --git a/docs/contribute.rst b/docs/contribute.rst
index f0055293..f4ba3374 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -6,7 +6,7 @@ The project actively encourages aspiring and experienced users to dive
in and add their best contribution to the project.
How can you contribute? Well, first search the `docs
-<https://docs.cherrypy.org>`_ and the `project page
+<https://docs.cherrypy.dev>`_ and the `project page
<https://github.com/cherrypy/cherrypy>`_ to see if someone
has already reported your issue.
diff --git a/docs/index.rst b/docs/index.rst
index a2e35029..6914a8dd 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -26,7 +26,7 @@ CherryPy — A Minimalist Python Web Framework
pkg/modules
-`CherryPy <http://www.cherrypy.org>`_ is a pythonic, object-oriented web framework.
+`CherryPy <http://www.cherrypy.dev>`_ is a pythonic, object-oriented web framework.
CherryPy allows developers to build web applications in much the
same way they would build any other object-oriented Python program.
diff --git a/man/cherryd.1 b/man/cherryd.1
index 1811660a..4e838bbe 100644
--- a/man/cherryd.1
+++ b/man/cherryd.1
@@ -253,7 +253,7 @@ These are the built\-in environment configurations:
fumanchu
.nf
-cherrypy.org
+cherrypy.dev
.fi
.SH COPYRIGHT
View Lorry Controller Status