From 6c996f42c53a36fc0406f836d64b8c1bec6f4bcc Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 26 Mar 2013 13:27:41 -0400
Subject: testsuite: fixed issues found by latest version of pylint

---
 src/lib/Bcfg2/Client/Tools/DebInit.py        | 2 +-
 src/lib/Bcfg2/Client/Tools/Encap.py          | 2 +-
 src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py | 2 +-
 src/lib/Bcfg2/Client/Tools/Portage.py        | 2 +-
 src/lib/Bcfg2/Client/Tools/SELinux.py        | 2 +-
 src/lib/Bcfg2/Client/Tools/Upstart.py        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/lib/Bcfg2/Client/Tools')

diff --git a/src/lib/Bcfg2/Client/Tools/DebInit.py b/src/lib/Bcfg2/Client/Tools/DebInit.py
index ca556e98b..d916b1662 100644
--- a/src/lib/Bcfg2/Client/Tools/DebInit.py
+++ b/src/lib/Bcfg2/Client/Tools/DebInit.py
@@ -16,7 +16,7 @@ class DebInit(Bcfg2.Client.Tools.SvcTool):
     __handles__ = [('Service', 'deb')]
     __req__ = {'Service': ['name', 'status']}
     svcre = \
-        re.compile("/etc/.*/(?P<action>[SK])(?P<sequence>\d+)(?P<name>\S+)")
+        re.compile(r'/etc/.*/(?P<action>[SK])(?P<sequence>\d+)(?P<name>\S+)')
 
     # implement entry (Verify|Install) ops
     def VerifyService(self, entry, _):
diff --git a/src/lib/Bcfg2/Client/Tools/Encap.py b/src/lib/Bcfg2/Client/Tools/Encap.py
index 678e0f00c..270f0a5f2 100644
--- a/src/lib/Bcfg2/Client/Tools/Encap.py
+++ b/src/lib/Bcfg2/Client/Tools/Encap.py
@@ -13,7 +13,7 @@ class Encap(Bcfg2.Client.Tools.PkgTool):
     __req__ = {'Package': ['version', 'url']}
     pkgtype = 'encap'
     pkgtool = ("/usr/local/bin/epkg -l -f -q %s", ("%s", ["url"]))
-    splitter = re.compile('.*/(?P<name>[\w-]+)\-(?P<version>[\w\.+-]+)')
+    splitter = re.compile(r'.*/(?P<name>[\w-]+)\-(?P<version>[\w\.+-]+)')
 
     def RefreshPackages(self):
         """Try to find encap packages."""
diff --git a/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
index 395f56f6a..31925fa3c 100644
--- a/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
+++ b/src/lib/Bcfg2/Client/Tools/FreeBSDPackage.py
@@ -21,7 +21,7 @@ class FreeBSDPackage(Bcfg2.Client.Tools.PkgTool):
     def RefreshPackages(self):
         self.installed = {}
         packages = self.cmd.run("/usr/sbin/pkg_info -a -E").stdout.splitlines()
-        pattern = re.compile('(.*)-(\d.*)')
+        pattern = re.compile(r'(.*)-(\d.*)')
         for pkg in packages:
             if pattern.match(pkg):
                 name = pattern.match(pkg).group(1)
diff --git a/src/lib/Bcfg2/Client/Tools/Portage.py b/src/lib/Bcfg2/Client/Tools/Portage.py
index 69d52b052..17e7755a9 100644
--- a/src/lib/Bcfg2/Client/Tools/Portage.py
+++ b/src/lib/Bcfg2/Client/Tools/Portage.py
@@ -22,7 +22,7 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
         Bcfg2.Client.Tools.PkgTool.__init__(self, logger, cfg, setup)
         self._initialised = True
         self.__important__ = self.__important__ + ['/etc/make.conf']
-        self._pkg_pattern = re.compile('(.*)-(\d.*)')
+        self._pkg_pattern = re.compile(r'(.*)-(\d.*)')
         self._ebuild_pattern = re.compile('(ebuild|binary)')
         self.cfg = cfg
         self.installed = {}
diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py
index f277cb0c8..617b7c2ef 100644
--- a/src/lib/Bcfg2/Client/Tools/SELinux.py
+++ b/src/lib/Bcfg2/Client/Tools/SELinux.py
@@ -170,7 +170,7 @@ class SELinuxEntryHandler(object):
     key_format = ("name",)
     value_format = ()
     str_format = '%(name)s'
-    custom_re = re.compile(' (?P<name>\S+)$')
+    custom_re = re.compile(r' (?P<name>\S+)$')
     custom_format = None
 
     def __init__(self, tool, logger, setup, config):
diff --git a/src/lib/Bcfg2/Client/Tools/Upstart.py b/src/lib/Bcfg2/Client/Tools/Upstart.py
index 921ca849f..c96eab69d 100644
--- a/src/lib/Bcfg2/Client/Tools/Upstart.py
+++ b/src/lib/Bcfg2/Client/Tools/Upstart.py
@@ -46,7 +46,7 @@ class Upstart(Bcfg2.Client.Tools.SvcTool):
                               entry.get('name'))
             return False
 
-        match = re.compile("%s( \(.*\))? (start|stop)/(running|waiting)" %
+        match = re.compile(r'%s( \(.*\))? (start|stop)/(running|waiting)' %
                            entry.get('name')).match(output)
         if match is None:
             # service does not exist
-- 
cgit v1.2.3-1-g7c22