Python 3.6 invalid escape sequence deprecation fixes

scop · DNF Bot · commit c9d414fe5999 · 2017-02-15T10:43:36.000Z
Closes: rpm-software-management#737 Approved by: ignatenkobrain
diff --git a/dnf/base.py b/dnf/base.py
@@ -730,7 +730,7 @@ def _trans_error_summary(self, errstring):
         """
         summary = ''
         # do disk space report first
-        p = re.compile('needs (\d+)MB on the (\S+) filesystem')
+        p = re.compile(r'needs (\d+)MB on the (\S+) filesystem')
         disk = {}
         for m in p.finditer(errstring):
             if m.group(2) not in disk:
diff --git a/dnf/cli/commands/repoquery.py b/dnf/cli/commands/repoquery.py
@@ -413,7 +413,7 @@ def grow_tree(self, level, pkg):
         for reqirepkg in pkg.requires:
             requires.append(str(reqirepkg))
         reqstr = "[" + str(len(requires)) + ": " + ", ".join(requires) + "]"
-        print(spacing + "\_ " + str(pkg) + " " + reqstr)
+        print(spacing + r"\_ " + str(pkg) + " " + reqstr)
 
     def tree_seed(self, query, aquery, opts, level=-1, usedpkgs=None):
         for pkg in sorted(set(query.run()), key=lambda p: p.name):
diff --git a/dnf/yum/misc.py b/dnf/yum/misc.py
@@ -54,7 +54,7 @@ def re_glob(s):
     """ Tests if a string is a shell wildcard. """
     global _re_compiled_glob_match
     if _re_compiled_glob_match is None:
-        _re_compiled_glob_match = re.compile('[*?]|\[.+\]').search
+        _re_compiled_glob_match = re.compile(r'[*?]|\[.+\]').search
     return _re_compiled_glob_match(s)
 
 _re_compiled_full_match = None
@@ -63,7 +63,7 @@ def re_full_search_needed(s):
     global _re_compiled_full_match
     if _re_compiled_full_match is None:
         # A glob, or a "." or "-" separator, followed by something (the ".")
-        one = re.compile('.*([-.*?]|\[.+\]).').match
+        one = re.compile(r'.*([-.*?]|\[.+\]).').match
         # Any epoch, for envra
         two = re.compile('[0-9]+:').match
         _re_compiled_full_match = (one, two)
@@ -484,16 +484,16 @@ def repo_gen_decompress(filename, generated_name, cached=False):
     return decompress(filename, dest=dest, check_timestamps=True, fn_only=cached)
 
 def read_in_items_from_dot_dir(thisglob, line_as_list=True):
-    """ Takes a glob of a dir (like /etc/foo.d/\*.foo) returns a list of all the
-       lines in all the files matching that glob, ignores comments and blank
+    """ Takes a glob of a dir (like /etc/foo.d/\\*.foo) returns a list of all
+       the lines in all the files matching that glob, ignores comments and blank
        lines, optional paramater 'line_as_list tells whether to treat each line
        as a space or comma-separated list, defaults to True.
     """
     results = []
     for fname in glob.glob(thisglob):
         with open(fname) as f:
             for line in f:
-                if re.match('\s*(#|$)', line):
+                if re.match(r'\s*(#|$)', line):
                     continue
                 line = line.rstrip() # no more trailing \n's
                 line = line.lstrip() # be nice
diff --git a/scripts/sanitize_po_files.py b/scripts/sanitize_po_files.py
@@ -28,7 +28,7 @@ def sanitize_po_file(po_file):
         msgstr_without_indents = entry.msgstr.strip()
         entry.msgstr = entry.msgid.replace(
             msgid_without_indents, msgstr_without_indents)
-        if re.match("^\s+$", entry.msgstr):
+        if re.match(r"^\s+$", entry.msgstr):
             entry.msgstr = ""
 
         if entry.msgid_plural:
@@ -38,7 +38,7 @@ def sanitize_po_file(po_file):
                 entry.msgstr_plural[i] = entry.msgid_plural.replace(
                     msgid_plural_without_indents,
                     msgstr_plural_without_indents)
-                if re.match("^\s+$", entry.msgstr_plural[i]):
+                if re.match(r"^\s+$", entry.msgstr_plural[i]):
                     entry.msgstr_plural[i] = ""
     po.save()
 
