fix unnecessary escapes

buildbot · Nov 10, 2015 · 4285c64 · 4285c64
1 parent c252fde
commit 4285c64
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/master/buildbot/clients/tryclient.py b/master/buildbot/clients/tryclient.py
@@ -263,7 +263,7 @@ def readPatch(self, res, patchlevel):
         found = False
         for line in res.split("\n"):
             m = re.search('==== //depot/' + self.branch
-                          + r'/([\w\/\.\d\-\_]+)#(\d+) -', line)
+                          + r'/([\w/\.\d\-_]+)#(\d+) -', line)
             if m:
                 mpatch += "--- %s#%s\n" % (m.group(1), m.group(2))
                 mpatch += "+++ %s\n" % (m.group(1))

diff --git a/master/buildbot/config.py b/master/buildbot/config.py
@@ -97,9 +97,9 @@ def __init__(self):
 
         self.validation = dict(
             branch=re.compile(r'^[\w.+/~-]*$'),
-            revision=re.compile(r'^[ \w\.\-\/]*$'),
-            property_name=re.compile(r'^[\w\.\-\/\~:]*$'),
-            property_value=re.compile(r'^[\w\.\-\/\~:]*$'),
+            revision=re.compile(r'^[ \w\.\-/]*$'),
+            property_name=re.compile(r'^[\w\.\-/~:]*$'),
+            property_value=re.compile(r'^[\w\.\-/~:]*$'),
         )
         self.db = dict(
             db_url=DEFAULT_DB_URL,

diff --git a/master/buildbot/steps/shell.py b/master/buildbot/steps/shell.py
@@ -376,7 +376,7 @@ class WarningCountingShellCommand(ShellCommand, CompositeStepMixin):
     directoryLeavePattern = "make.*: Leaving directory"
     suppressionFile = None
 
-    commentEmptyLineRe = re.compile(r"^\s*(\#.*)?$")
+    commentEmptyLineRe = re.compile(r"^\s*(#.*)?$")
     suppressionLineRe = re.compile(r"^\s*(.+?)\s*:\s*(.+?)\s*(?:[:]\s*([0-9]+)(?:-([0-9]+))?\s*)?$")
 
     def __init__(self,

diff --git a/master/buildbot/steps/source/svn.py b/master/buildbot/steps/source/svn.py
@@ -411,7 +411,7 @@ def computeSourceRevision(self, changes):
     @staticmethod
     def svnUriCanonicalize(uri):
         collapse = re.compile(r'([^/]+/\.\./?|/\./|//|/\.$|/\.\.$|^/\.\.)')
-        server_authority = re.compile(r'^(?:([^\@]+)\@)?([^\:]+)(?:\:(.+))?$')
+        server_authority = re.compile(r'^(?:([^@]+)@)?([^:]+)(?::(.+))?$')
         default_port = {'http': '80',
                         'https': '443',
                         'svn': '3690'}

diff --git a/master/buildbot/util/identifiers.py b/master/buildbot/util/identifiers.py
@@ -19,7 +19,7 @@
 
 ident_re = re.compile('^[a-zA-Z_-][a-zA-Z0-9_-]*$')
 initial_re = re.compile('^[^a-zA-Z_-]')
-subsequent_re = re.compile('[^a-zA-Z-0-9_-]')
+subsequent_re = re.compile('[^a-zA-Z0-9_-]')
 trailing_digits_re = re.compile('_([0-9]+)$')
 
 

diff --git a/master/buildbot/www/hooks/github.py b/master/buildbot/www/hooks/github.py
@@ -160,7 +160,7 @@ def _process_change(self, payload, user, repo, repo_url, project):
         refname = payload['ref']
 
         # We only care about regular heads, i.e. branches
-        match = re.match(r"^refs\/heads\/(.+)$", refname)
+        match = re.match(r"^refs/heads/(.+)$", refname)
         if not match:
             log.msg("Ignoring refname `%s': Not a branch" % refname)
             return changes

diff --git a/master/buildbot/www/hooks/gitlab.py b/master/buildbot/www/hooks/gitlab.py
@@ -33,7 +33,7 @@ def _process_change(payload, user, repo, repo_url, project, codebase=None):
     refname = payload['ref']
 
     # We only care about regular heads, i.e. branches
-    match = re.match(r"^refs\/heads\/(.+)$", refname)
+    match = re.match(r"^refs/heads/(.+)$", refname)
     if not match:
         log.msg("Ignoring refname `%s': Not a branch" % refname)
         return changes

diff --git a/master/contrib/buildbot_cvs_mail.py b/master/contrib/buildbot_cvs_mail.py
@@ -70,7 +70,7 @@ def sendmail(self, address, email, msg):
             sys.stdout.write(msg)
 
 
-rfc822_specials_re = re.compile(r'[\(\)\<\>\@\,\;\:\\\"\.\[\]]')
+rfc822_specials_re = re.compile(r'[\(\)<>@,;:\\\"\.\[\]]')
 
 
 def quotename(name):

diff --git a/master/contrib/git_buildbot.py b/master/contrib/git_buildbot.py
@@ -321,7 +321,7 @@ def process_tag_change(oldrev, newrev, refname, tag):
 
 def process_change(oldrev, newrev, refname):
     # Identify the change as a branch, tag or other, and process it
-    m = re.match(r"^refs\/(heads|tags)\/(.+)$", refname)
+    m = re.match(r"^refs/(heads|tags)/(.+)$", refname)
     if not m:
         logging.info("Ignoring refname `%s': Not a branch or tag", refname)
         return

diff --git a/master/contrib/github_buildbot.py b/master/contrib/github_buildbot.py
@@ -176,7 +176,7 @@ def handle_push(self, payload, repo, repo_url):
         changes = None
         refname = payload['ref']
 
-        m = re.match(r"^refs\/(heads|tags)\/(.+)$", refname)
+        m = re.match(r"^refs/(heads|tags)/(.+)$", refname)
         if not m:
             logging.info(
                 "Ignoring refname `%s': Not a branch or a tag", refname)