From e384b4c917e4a5c604baea975a9c69d38fe3dc4c Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Thu, 9 Jan 2020 13:25:59 +0100
Subject: [PATCH] Fix a number of incorrect escapes

Pointed out by newer versions of pep8, but they were never correct.
---
 pgweb/account/forms.py                       | 2 +-
 pgweb/docs/views.py                          | 4 ++--
 pgweb/security/models.py                     | 2 +-
 pgweb/util/misc.py                           | 4 ++--
 tools/docs/docload.py                        | 2 +-
 tools/ftp/spider_yum.py                      | 2 +-
 tools/localhtmlvalidate/localhtmlvalidate.py | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pgweb/account/forms.py b/pgweb/account/forms.py
index f16d30eb..a9f322ee 100644
--- a/pgweb/account/forms.py
+++ b/pgweb/account/forms.py
@@ -16,7 +16,7 @@ log = logging.getLogger(__name__)
 def _clean_username(username):
     username = username.lower()
 
-    if not re.match('^[a-z0-9\.-]+$', username):
+    if not re.match(r'^[a-z0-9\.-]+$', username):
         # XXX: Note! Should we ever allow @ signs in usernames again, we need to also
         #      update util/auth.py and the code for identifying email addresses.
         raise forms.ValidationError("Invalid character in user name. Only a-z, 0-9, . and - allowed for compatibility with third party software.")
diff --git a/pgweb/docs/views.py b/pgweb/docs/views.py
index 9d0f55fd..05661295 100644
--- a/pgweb/docs/views.py
+++ b/pgweb/docs/views.py
@@ -244,9 +244,9 @@ def release_notes(request, major_version=None, minor_version=None):
             SELECT
                 {content}
                 file,
-                string_to_array(regexp_replace(file, 'release-(.*)\.htm.*', '\\1'), '-') AS v
+                string_to_array(regexp_replace(file, 'release-(.*)\\.htm.*', '\\1'), '-') AS v
             FROM docs
-            WHERE file ~ '^release-\d+' AND version >= 9.3
+            WHERE file ~ '^release-\\d+' AND version >= 9.3
         ) r
     ) rr
     """
diff --git a/pgweb/security/models.py b/pgweb/security/models.py
index 18418561..6242e628 100644
--- a/pgweb/security/models.py
+++ b/pgweb/security/models.py
@@ -20,7 +20,7 @@ component_choices = (
 )
 
 
-re_cve = re.compile('^(\d{4})-(\d{4,5})$')
+re_cve = re.compile(r'^(\d{4})-(\d{4,5})$')
 
 
 def cve_validator(val):
diff --git a/pgweb/util/misc.py b/pgweb/util/misc.py
index 331ac90f..5d45b7a0 100644
--- a/pgweb/util/misc.py
+++ b/pgweb/util/misc.py
@@ -69,10 +69,10 @@ def version_sort(l):
     generally don't have that.
     """
     mkey = l['link']
-    m = re.match('v?([0-9]+)\.([0-9]+)\.([0-9]+)$', l['url'])
+    m = re.match(r'v?([0-9]+)\.([0-9]+)\.([0-9]+)$', l['url'])
     if m:
         mkey = m.group(1) + '%02d' % int(m.group(2)) + '%02d' % int(m.group(3))
-    m = re.match('v?([0-9]+)\.([0-9]+)$', l['url'])
+    m = re.match(r'v?([0-9]+)\.([0-9]+)$', l['url'])
     if m:
         mkey = m.group(1) + '%02d' % int(m.group(2))
         # SOOO ugly. But if it's v10 and up, just prefix it to get it higher
diff --git a/tools/docs/docload.py b/tools/docs/docload.py
index 094d9651..362da79b 100755
--- a/tools/docs/docload.py
+++ b/tools/docs/docload.py
@@ -23,7 +23,7 @@ pagecount = 0
 quiet = False
 # regular expression used to search and extract the title on a given piece of
 # documentation, for further use in the application
-re_titlematch = re.compile('<title\s*>([^<]+)</title\s*>', re.IGNORECASE)
+re_titlematch = re.compile(r'<title\s*>([^<]+)</title\s*>', re.IGNORECASE)
 # regular expression used to find any images that are in the HTML and apply
 # additional bootstrap classes
 re_figure_match = re.compile('<div([^<>]+)class="figure"', re.IGNORECASE)
diff --git a/tools/ftp/spider_yum.py b/tools/ftp/spider_yum.py
index 4dfd6191..2dfa5431 100755
--- a/tools/ftp/spider_yum.py
+++ b/tools/ftp/spider_yum.py
@@ -8,7 +8,7 @@ import requests
 from collections import defaultdict
 from tempfile import NamedTemporaryFile
 
-re_platformdir = re.compile('^(\w+)-(\d+)-([^-]+)$')
+re_platformdir = re.compile(r'^(\w+)-(\d+)-([^-]+)$')
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Spider repo RPMs")
diff --git a/tools/localhtmlvalidate/localhtmlvalidate.py b/tools/localhtmlvalidate/localhtmlvalidate.py
index 4332350b..7160b52b 100755
--- a/tools/localhtmlvalidate/localhtmlvalidate.py
+++ b/tools/localhtmlvalidate/localhtmlvalidate.py
@@ -61,7 +61,7 @@ if __name__ == "__main__":
         print("Warnings: %s" % resp.headers['x-w3c-validator-warnings'])
         hp = html.parser.HTMLParser()
         for m in re.findall('<li class="msg_err">.*?</li>', resp.text, re.DOTALL):
-            r = re.search('<em>Line <a href="[^"]+">(\d+)</a>.*<span class="msg">(.*?)</span>', m, re.DOTALL)
+            r = re.search(r'<em>Line <a href="[^"]+">(\d+)</a>.*<span class="msg">(.*?)</span>', m, re.DOTALL)
             if r:
                 print("Line %s (should be around %s): %s" % (r.group(1), int(r.group(1)) - firstline, hp.unescape(r.group(2))))
             r2 = re.search('<code class="input">(.*?)<strong title=".*?">(.*?)</strong>(.*?)</code>', m, re.DOTALL)