[PATCH] Python 3.6 invalid escape sequence deprecation fixes

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior

Signed-off-by: Ville Skyttä <ville.skytta@xxxxxx>
---
 python/semanage/seobject.py            | 4 ++--
 python/sepolgen/src/sepolgen/module.py | 2 +-
 python/sepolicy/sepolicy/generate.py   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/python/semanage/seobject.py b/python/semanage/seobject.py
index c836cc5..94bd368 100644
--- a/python/semanage/seobject.py
+++ b/python/semanage/seobject.py
@@ -192,8 +192,8 @@ class nulllogger:
 def validate_level(raw):
     sensitivity = "s[0-9]*"
     category = "c[0-9]*"
-    cat_range = category + "(\." + category + ")?"
-    categories = cat_range + "(\," + cat_range + ")*"
+    cat_range = category + r"(\." + category + ")?"
+    categories = cat_range + r"(\," + cat_range + ")*"
     reg = sensitivity + "(-" + sensitivity + ")?" + "(:" + categories + ")?"
     return re.search("^" + reg + "$", raw)
 
diff --git a/python/sepolgen/src/sepolgen/module.py b/python/sepolgen/src/sepolgen/module.py
index c09676a..8766dd9 100644
--- a/python/sepolgen/src/sepolgen/module.py
+++ b/python/sepolgen/src/sepolgen/module.py
@@ -40,7 +40,7 @@ from . import defaults
 def is_valid_name(modname):
     """Check that a module name is valid.
     """
-    m = re.findall("[^a-zA-Z0-9_\-\.]", modname)
+    m = re.findall(r"[^a-zA-Z0-9_\-\.]", modname)
     if len(m) == 0 and modname[0].isalpha():
         return True
     else:
diff --git a/python/sepolicy/sepolicy/generate.py b/python/sepolicy/sepolicy/generate.py
index 5696110..596891a 100644
--- a/python/sepolicy/sepolicy/generate.py
+++ b/python/sepolicy/sepolicy/generate.py
@@ -1329,7 +1329,7 @@ allow %s_t %s_t:%s_socket name_%s;
             self.add_dir("/var/lib/%s" % self.name)
 
         if os.path.isfile("/etc/rc.d/init.d/%s" % self.name):
-            self.set_init_script("/etc/rc\.d/init\.d/%s" % self.name)
+            self.set_init_script(r"/etc/rc\.d/init\.d/%s" % self.name)
 
         # we don't want to have subdir in the .fc policy file
         # if we already specify labeling for parent dir
-- 
2.9.3

_______________________________________________
Selinux mailing list
Selinux@xxxxxxxxxxxxx
To unsubscribe, send email to Selinux-leave@xxxxxxxxxxxxx.
To get help, send an email containing "help" to Selinux-request@xxxxxxxxxxxxx.




[Index of Archives]     [Selinux Refpolicy]     [Linux SGX]     [Fedora Users]     [Fedora Desktop]     [Yosemite Photos]     [Yosemite Camping]     [Yosemite Campsites]     [KDE Users]     [Gnome Users]

  Powered by Linux