diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2017-07-11 00:58:39 +0300 |
|---|---|---|
| committer | Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua> | 2017-07-10 23:58:39 +0200 |
| commit | 82cf67b36c151b53735ebeb113d7718d26fc339f (patch) | |
| tree | 39a5179f581417e5d3c04fabd1f415a234ef0d7a /cherrypy/lib/httputil.py | |
| parent | fb05b07aa5d419f6b1f4b20bc0458d0ae4013314 (diff) | |
| download | cherrypy-git-82cf67b36c151b53735ebeb113d7718d26fc339f.tar.gz | |
Mark docstrings with slash escaping as raw str (PR #1610 by @scop)
* https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
(Python 3.6 invalid escape sequence deprecation)
Diffstat (limited to 'cherrypy/lib/httputil.py')
| -rw-r--r-- | cherrypy/lib/httputil.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cherrypy/lib/httputil.py b/cherrypy/lib/httputil.py index e977b77e..a3c9c769 100644 --- a/cherrypy/lib/httputil.py +++ b/cherrypy/lib/httputil.py @@ -42,7 +42,7 @@ HTTPDate = functools.partial(email.utils.formatdate, usegmt=True) def urljoin(*atoms): - """Return the given path \*atoms, joined into a single URL. + r"""Return the given path \*atoms, joined into a single URL. This will correctly join a SCRIPT_NAME and PATH_INFO into the original URL, even if either atom is blank. |