Fix escaping in raw regexp strings. #1441

perfsonar · Jun 27, 2024 · 8ff9773 · 8ff9773
1 parent e008658
commit 8ff9773
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/pscheduler-tool-tcpping/tcpping/run b/pscheduler-tool-tcpping/tcpping/run
@@ -184,18 +184,18 @@ result = {
 
 
 # TCP Ping Results: Connections (Total/Pass/Fail): [3/3/0] (Failed: 0%)
-CONNECTED = re.compile(r'^Connected to\\s*[^\\s]+'
-                       r'\\s+\\(([^)]+)\)'
-                       r'\\s+.*:'
-                       r'\\s+tcp_seq=([0-9]+)'
-                       r'\\s+time=([0-9.]+) ms$')
+CONNECTED = re.compile(r'^Connected to\s*[^\s]+'
+                       r'\s+\(([^)]+)\)'
+                       r'\s+.*:'
+                       r'\s+tcp_seq=([0-9]+)'
+                       r'\s+time=([0-9.]+) ms$')
 
 # TCP Ping Results: Connections (Total/Pass/Fail): [3/3/0] (Failed: 0%)
-COUNTED = re.compile(r'^TCP Ping Results: Connections \\(Total/Pass/Fail\\): \\[([0-9]+)/([0-9]+)/([0-9]+)\\]')
+COUNTED = re.compile(r'^TCP Ping Results: Connections \(Total/Pass/Fail\): \[([0-9]+)/([0-9]+)/([0-9]+)\]')
 
 # rtt min/avg/max/mdev = 32.660/32.827/33.150/0.280 ms
-STATS = re.compile(r'^rtt min/avg/max/mdev\\s+=\\s+'
-                   r'([0-9.]+)/([0-9.]+)/([0-9.]+)/([0-9.]+)\\s+ms')
+STATS = re.compile(r'^rtt min/avg/max/mdev\s+=\s+'
+                   r'([0-9.]+)/([0-9.]+)/([0-9.]+)/([0-9.]+)\s+ms')
 
 
 

diff --git a/python-pscheduler/pscheduler/pscheduler/jsonval.py b/python-pscheduler/pscheduler/pscheduler/jsonval.py
@@ -350,7 +350,7 @@
         "oneOf": [
             {
                 "type": "string",
-                "pattern": r'^[0-9]+(\\.[0-9]+)?(\\s*[KkMmGgTtPpEeZzYy][Ii]?)?$'
+                "pattern": r'^[0-9]+(\.[0-9]+)?(\s*[KkMmGgTtPpEeZzYy][Ii]?)?$'
             },
             {
                 "type": "integer"