Show More
@@ -144,9 +144,7 b' class convert_cvs(converter_source):' | |||
|
144 | 144 | |
|
145 | 145 | if root.startswith(b":pserver:"): |
|
146 | 146 | root = root[9:] |
|
147 | m = re.match( | |
|
148 | r'(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?(.*)', root | |
|
149 | ) | |
|
147 | m = re.match(r'(?:(.*?)(?::(.*?))?@)?([^:/]*)(?::(\d*))?(.*)', root) | |
|
150 | 148 | if m: |
|
151 | 149 | conntype = b"pserver" |
|
152 | 150 | user, passw, serv, port, root = m.groups() |
@@ -13,7 +13,7 b' from __future__ import absolute_import, ' | |||
|
13 | 13 | |
|
14 | 14 | import re |
|
15 | 15 | |
|
16 |
tspecials = re.compile(br'[ |
|
|
16 | tspecials = re.compile(br'[ ()<>@,;:\\"/\[\]?=]') | |
|
17 | 17 | |
|
18 | 18 | |
|
19 | 19 | def _formatparam(param, value=None, quote=1): |
@@ -1626,7 +1626,7 b' class ui(object):' | |||
|
1626 | 1626 | # prompt to start parsing. Sadly, we also can't rely on |
|
1627 | 1627 | # choices containing spaces, ASCII, or basically anything |
|
1628 | 1628 | # except an ampersand followed by a character. |
|
1629 |
m = re.match(br'(?s)(.+?)\$\$([^ |
|
|
1629 | m = re.match(br'(?s)(.+?)\$\$([^$]*&[^ $].*)', prompt) | |
|
1630 | 1630 | msg = m.group(1) |
|
1631 | 1631 | choices = [p.strip(b' ') for p in m.group(2).split(b'$$')] |
|
1632 | 1632 |
@@ -1165,7 +1165,7 b' def versiontuple(v=None, n=4):' | |||
|
1165 | 1165 | """ |
|
1166 | 1166 | if not v: |
|
1167 | 1167 | v = version() |
|
1168 |
m = remod.match(br'(\d+(?:\.\d+){,2})[ |
|
|
1168 | m = remod.match(br'(\d+(?:\.\d+){,2})[+-]?(.*)', v) | |
|
1169 | 1169 | if not m: |
|
1170 | 1170 | vparts, extra = b'', v |
|
1171 | 1171 | elif m.group(2): |
@@ -3179,9 +3179,7 b' class TestRunner(object):' | |||
|
3179 | 3179 | expanded_args.append(arg) |
|
3180 | 3180 | args = expanded_args |
|
3181 | 3181 | |
|
3182 | testcasepattern = re.compile( | |
|
3183 | br'([\w-]+\.t|py)(?:#([a-zA-Z0-9_\-\.#]+))' | |
|
3184 | ) | |
|
3182 | testcasepattern = re.compile(br'([\w-]+\.t|py)(?:#([a-zA-Z0-9_\-.#]+))') | |
|
3185 | 3183 | tests = [] |
|
3186 | 3184 | for t in args: |
|
3187 | 3185 | case = [] |
General Comments 0
You need to be logged in to leave comments.
Login now