Apply suggestions from code review

Co-authored-by: Denis Rouzaud <denis.rouzaud@gmail.com>
qgis · May 6, 2020 · 3e6c7c2 · 3e6c7c2
1 parent 841328e
commit 3e6c7c2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.ci/travis/scripts/ctest2travis.py b/.ci/travis/scripts/ctest2travis.py
@@ -83,7 +83,7 @@ def start_test_fold():
         end_fold() # tag=build
         start_test_fold()
 
-    if re.search('***Failed', updated_line) or re.search('***Timeout', updated_line):
+    if re.search(r'\*\*\*Failed', updated_line) or re.search(r'\*\*\*Timeout', updated_line):
         end_fold()
         updated_line = colored(updated_line, 'red')
         in_failing_test = True
@@ -97,14 +97,14 @@ def start_test_fold():
                 in_failure = False
             else:
                 updated_line = colored(updated_line, 'yellow')
-        elif re.search('*** Segmentation fault', updated_line):
+        elif re.search(r'\*\*\* Segmentation fault', updated_line):
             start_fold('segfault')
             updated_line = colored(updated_line, 'magenta')
         elif re.match('  Test failed: Segmentation fault', updated_line):
             end_fold()
 
         else:
-            if re.match('(FAIL|ERROR)[:!].*', updated_line):
+            if re.match(r'(FAIL|ERROR)[:\!].*', updated_line):
                 updated_line = colored(updated_line, 'yellow')
                 in_failure = True
 

diff --git a/scripts/qgis_fixes/fix_signals.py b/scripts/qgis_fixes/fix_signals.py
@@ -59,7 +59,7 @@ class FixSignals(fixer_base.BaseFix):
 
     def transform(self, node, results):
         signal = results.get("signal").value
-        signal = re.sub('^["\']([^(]+)(?:(.*))?["\']$', '\\1', signal)
+        signal = re.sub('^["\']([^(]+)(?:\\(.*\\))?["\']$', '\\1', signal)
 
         if 'emitter' in results:
             emitter = results.get("emitter").clone()

diff --git a/tests/src/python/test_qgsserver.py b/tests/src/python/test_qgsserver.py
@@ -51,7 +51,7 @@
 
 
 # Strip path and content length because path may vary
-RE_STRIP_UNCHECKABLE = rb'MAP=[^"]+|Content-Length: \d+'
+RE_STRIP_UNCHECKABLE = br'MAP=[^"]+|Content-Length: \d+'
 RE_ELEMENT = br'</*([^>\[\s]+)[ >]'
 RE_ELEMENT_CONTENT = br'<[^>\[]+>(.+)</[^>\[\s]+>'
 RE_ATTRIBUTES = rb'((?:(?!\s|=).)*)\s*?=\s*?["\']?((?:(?<=")(?:(?<=\\)"|[^"])*|(?<=\')(?:(?<=\\)\'|[^\'])*)|(?:(?!"|\')(?:(?!\/>|>|\s).)+))'

diff --git a/tests/src/python/test_qgsserver_wfst.py b/tests/src/python/test_qgsserver_wfst.py
@@ -92,7 +92,7 @@ def setUpClass(cls):
         cls.server = subprocess.Popen([sys.executable, server_path],
                                       env=os.environ, stdout=subprocess.PIPE)
         line = cls.server.stdout.readline()
-        cls.port = int(re.findall(r':(\d+)', line)[0])
+        cls.port = int(re.findall(br':(\d+)', line)[0])
         assert cls.port != 0
         # Wait for the server process to start
         assert waitServer('http://127.0.0.1:%s' % cls.port), "Server is not responding!"