Fix a number of places where literal backslashes in Python strings should have been escaped (#105)

Author: musicinmybrain

changelog.rst

@@ -11,6 +11,11 @@ Features:
 
 * Fix for broken `MANIFEST.in` that prevented source installation (#101. Thanks: `Dave Hirschfeld`_).
 
+Bug fixes:
+----------
+
+* Fix deprecation warnings with stricter backslash escaping in strings. (Thanks: `Benjamin Beasley`_)
+
 1.12.0
 ======
 

pgspecial/dbcommands.py

@@ -1805,7 +1805,7 @@ def describe_one_table_details(cur, schema_name, relation_name, oid, verbose):
             # /* print the number of child tables, if any */
             if cur.rowcount > 0:
                 status.append(
-                    "Number of child tables: %d (Use \d+ to list"
+                    "Number of child tables: %d (Use \\d+ to list"
                     " them.)\n" % cur.rowcount
                 )
         else:

pgspecial/iocommands.py

@@ -20,7 +20,7 @@
 @export
 def editor_command(command):
     """
-    Is this an external editor command?  (\e or \ev)
+    Is this an external editor command?  (\\e or \\ev)
 
     :param command: string
 
@@ -47,7 +47,7 @@ def get_filename(sql):
 
 @export
 def get_watch_command(command):
-    match = re.match("(.*?)[\s]*\\\\watch (\d+);?$", command)
+    match = re.match("(.*?)[\\s]*\\\\watch (\\d+);?$", command)
     if match:
         groups = match.groups()
         return groups[0], int(groups[1])
@@ -188,7 +188,7 @@ def subst_favorite_query_args(query, args):
 
         query = query.replace(subst_var, val)
 
-    match = re.search("\\$\d+", query)
+    match = re.search("\\$\\d+", query)
     if match:
         return [
             None,

pgspecial/main.py

@@ -66,7 +66,7 @@ def __init__(self):
             self.call_pset,
             "\\pset",
             "\\pset [key] [value]",
-            "A limited version of traditional \pset",
+            "A limited version of traditional \\pset",
             arg_type=PARSED_QUERY,
         )
 
@@ -151,7 +151,7 @@ def show_command_help(self, pattern, **_):
                 message += helpcommand["synopsis"]
         else:
             message = 'No help available for "%s"' % pattern
-            message += "\nTry \h with no arguments to see available help."
+            message += "\nTry \\h with no arguments to see available help."
 
         return [(None, None, None, message)]
 

scripts/docparser.py

@@ -33,7 +33,7 @@ def parse(file_name):
         print("Parse postgres SGML reference files into JSON")
         print("Usage:")
         print(
-            'echo -n "commands = " > command_help.py; python parser.py ref/ | python -mjson.tool | sed \'s/"\: null/": None/g\' >>  command_help.py'
+            'echo -n "commands = " > command_help.py; python parser.py ref/ | python -mjson.tool | sed \'s/"\\: null/": None/g\' >>  command_help.py'
         )
         print("")
         sys.exit(0)