Show More
@@ -578,8 +578,6 b' def pytest(test, wd, options, replacemen' | |||
|
578 | 578 | py3kswitch = options.py3k_warnings and ' -3' or '' |
|
579 | 579 | cmd = '%s%s "%s"' % (PYTHON, py3kswitch, test) |
|
580 | 580 | vlog("# Running", cmd) |
|
581 | if os.name == 'nt': | |
|
582 | replacements.append((r'\r\n', '\n')) | |
|
583 | 581 | return run(cmd, wd, options, replacements, env) |
|
584 | 582 | |
|
585 | 583 | needescape = re.compile(r'[\x00-\x08\x0b-\x1f\x7f-\xff]').search |
@@ -594,8 +592,6 b' def stringescape(s):' | |||
|
594 | 592 | def rematch(el, l): |
|
595 | 593 | try: |
|
596 | 594 | # use \Z to ensure that the regex matches to the end of the string |
|
597 | if os.name == 'nt': | |
|
598 | return re.match(el + r'\r?\n\Z', l) | |
|
599 | 595 | return re.match(el + r'\n\Z', l) |
|
600 | 596 | except re.error: |
|
601 | 597 | # el is an invalid regex |
@@ -633,8 +629,6 b' def linematch(el, l):' | |||
|
633 | 629 | if el: |
|
634 | 630 | if el.endswith(" (esc)\n"): |
|
635 | 631 | el = el[:-7].decode('string-escape') + '\n' |
|
636 | if el == l or os.name == 'nt' and el[:-1] + '\r\n' == l: | |
|
637 | return True | |
|
638 | 632 | if (el.endswith(" (re)\n") and rematch(el[:-6], l) or |
|
639 | 633 | el.endswith(" (glob)\n") and globmatch(el[:-8], l)): |
|
640 | 634 | return True |
@@ -953,6 +947,7 b' def runone(options, test, count):' | |||
|
953 | 947 | c.isdigit() and c or |
|
954 | 948 | '\\' + c |
|
955 | 949 | for c in testtmp), '$TESTTMP')) |
|
950 | replacements.append((r'\r\n', '\n')) | |
|
956 | 951 | else: |
|
957 | 952 | replacements.append((re.escape(testtmp), '$TESTTMP')) |
|
958 | 953 |
General Comments 0
You need to be logged in to leave comments.
Login now