[pypy-commit] pypy unicode-utf8-py3: fix bad merge from fix-sre-problems
mattip
pypy.commits at gmail.com
Fri Nov 2 03:34:23 EDT 2018
Author: Matti Picus <matti.picus at gmail.com>
Branch: unicode-utf8-py3
Changeset: r95270:aac35506e1a4
Date: 2018-11-02 09:17 +0200
http://bitbucket.org/pypy/pypy/changeset/aac35506e1a4/
Log: fix bad merge from fix-sre-problems
diff --git a/rpython/rlib/rsre/test/support.py b/rpython/rlib/rsre/test/support.py
--- a/rpython/rlib/rsre/test/support.py
+++ b/rpython/rlib/rsre/test/support.py
@@ -111,9 +111,9 @@
start, end = _adjust(start, end, len(string))
start = Position(start)
end = Position(end)
- ctx = MatchContextForTests(pattern, string, start, end, flags)
+ ctx = MatchContextForTests(string, start, end, flags)
ctx.fullmatch_only = fullmatch
- if match_context(ctx):
+ if match_context(ctx, pattern):
return ctx
else:
return None
@@ -125,8 +125,8 @@
start, end = _adjust(start, end, len(string))
start = Position(start)
end = Position(end)
- ctx = MatchContextForTests(pattern, string, start, end, flags)
- if search_context(ctx):
+ ctx = MatchContextForTests(string, start, end, flags)
+ if search_context(ctx, pattern):
return ctx
else:
return None
More information about the pypy-commit
mailing list