summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Lundh <fredrik@pythonware.com>2000-06-30 21:40:20 (GMT)
committerFredrik Lundh <fredrik@pythonware.com>2000-06-30 21:40:20 (GMT)
commitef34bd2c0d00d2ef23bcffaf21b169342729a26b (patch)
tree64946a3a9ca1e4ccb387ea137268cab789b04842
parent47674029e16b45e0985dbaa2cf6c7e0455acf0e3 (diff)
downloadcpython-ef34bd2c0d00d2ef23bcffaf21b169342729a26b.zip
cpython-ef34bd2c0d00d2ef23bcffaf21b169342729a26b.tar.gz
cpython-ef34bd2c0d00d2ef23bcffaf21b169342729a26b.tar.bz2
-- changed $ to match before a trailing newline, even
if the multiline flag isn't given.
-rw-r--r--Modules/_sre.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/_sre.c b/Modules/_sre.c
index 268c5dd..46fe4ed 100644
--- a/Modules/_sre.c
+++ b/Modules/_sre.c
@@ -310,7 +310,9 @@ SRE_AT(SRE_STATE* state, SRE_CHAR* ptr, SRE_CODE at)
SRE_IS_LINEBREAK((int) ptr[-1]));
case SRE_AT_END:
- return ((void*) ptr == state->end);
+ return (((void*) (ptr+1) == state->end &&
+ SRE_IS_LINEBREAK((int) ptr[0])) ||
+ ((void*) ptr == state->end));
case SRE_AT_END_LINE:
return ((void*) ptr == state->end ||