2000-03-31 10:58:54 -04:00
|
|
|
|
#
|
|
|
|
|
# Secret Labs' Regular Expression Engine
|
|
|
|
|
#
|
|
|
|
|
# convert template to internal format
|
|
|
|
|
#
|
2001-01-14 11:06:11 -04:00
|
|
|
|
# Copyright (c) 1997-2001 by Secret Labs AB. All rights reserved.
|
2000-03-31 10:58:54 -04:00
|
|
|
|
#
|
2000-08-01 15:20:07 -03:00
|
|
|
|
# See the sre.py file for information on usage and redistribution.
|
2000-03-31 10:58:54 -04:00
|
|
|
|
#
|
|
|
|
|
|
2001-09-04 16:10:20 -03:00
|
|
|
|
"""Internal support module for sre"""
|
|
|
|
|
|
2014-03-20 05:16:38 -03:00
|
|
|
|
import _sre
|
Merged revisions 62194,62197-62198,62204-62205,62214,62219-62221,62227,62229-62231,62233-62235,62237-62239 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62194 | jeffrey.yasskin | 2008-04-07 01:04:28 +0200 (Mon, 07 Apr 2008) | 7 lines
Add enough debugging information to diagnose failures where the
HandlerBException is ignored, and fix one such problem, where it was thrown
during the __del__ method of the previous Popen object.
We may want to find a better way of printing verbose information so it's not
spammy when the test passes.
........
r62197 | mark.hammond | 2008-04-07 03:53:39 +0200 (Mon, 07 Apr 2008) | 2 lines
Issue #2513: enable 64bit cross compilation on windows.
........
r62198 | mark.hammond | 2008-04-07 03:59:40 +0200 (Mon, 07 Apr 2008) | 2 lines
correct heading underline for new "Cross-compiling on Windows" section
........
r62204 | gregory.p.smith | 2008-04-07 08:33:21 +0200 (Mon, 07 Apr 2008) | 4 lines
Use the new PyFile_IncUseCount & PyFile_DecUseCount calls appropriatly
within the standard library. These modules use PyFile_AsFile and later
release the GIL while operating on the previously returned FILE*.
........
r62205 | mark.summerfield | 2008-04-07 09:39:23 +0200 (Mon, 07 Apr 2008) | 4 lines
changed "2500 components" to "several thousand" since the number keeps
growning:-)
........
r62214 | georg.brandl | 2008-04-07 20:51:59 +0200 (Mon, 07 Apr 2008) | 2 lines
#2525: update timezone info examples in the docs.
........
r62219 | andrew.kuchling | 2008-04-08 01:57:07 +0200 (Tue, 08 Apr 2008) | 1 line
Write PEP 3127 section; add items
........
r62220 | andrew.kuchling | 2008-04-08 01:57:21 +0200 (Tue, 08 Apr 2008) | 1 line
Typo fix
........
r62221 | andrew.kuchling | 2008-04-08 03:33:10 +0200 (Tue, 08 Apr 2008) | 1 line
Typographical fix: 32bit -> 32-bit, 64bit -> 64-bit
........
r62227 | andrew.kuchling | 2008-04-08 23:22:53 +0200 (Tue, 08 Apr 2008) | 1 line
Add items
........
r62229 | amaury.forgeotdarc | 2008-04-08 23:27:42 +0200 (Tue, 08 Apr 2008) | 7 lines
Issue2564: Prevent a hang in "import test.autotest", which runs the entire test
suite as a side-effect of importing the module.
- in test_capi, a thread tried to import other modules
- re.compile() imported sre_parse again on every call.
........
r62230 | amaury.forgeotdarc | 2008-04-08 23:51:57 +0200 (Tue, 08 Apr 2008) | 2 lines
Prevent an error when inspect.isabstract() is called with something else than a new-style class.
........
r62231 | amaury.forgeotdarc | 2008-04-09 00:07:05 +0200 (Wed, 09 Apr 2008) | 8 lines
Issue 2408: remove the _types module
It was only used as a helper in types.py to access types (GetSetDescriptorType and MemberDescriptorType),
when they can easily be obtained with python code.
These expressions even work with Jython.
I don't know what the future of the types module is; (cf. discussion in http://bugs.python.org/issue1605 )
at least this change makes it simpler.
........
r62233 | amaury.forgeotdarc | 2008-04-09 01:10:07 +0200 (Wed, 09 Apr 2008) | 2 lines
Add a NEWS entry for previous checkin
........
r62234 | trent.nelson | 2008-04-09 01:47:30 +0200 (Wed, 09 Apr 2008) | 37 lines
- Issue #2550: The approach used by client/server code for obtaining ports
to listen on in network-oriented tests has been refined in an effort to
facilitate running multiple instances of the entire regression test suite
in parallel without issue. test_support.bind_port() has been fixed such
that it will always return a unique port -- which wasn't always the case
with the previous implementation, especially if socket options had been
set that affected address reuse (i.e. SO_REUSEADDR, SO_REUSEPORT). The
new implementation of bind_port() will actually raise an exception if it
is passed an AF_INET/SOCK_STREAM socket with either the SO_REUSEADDR or
SO_REUSEPORT socket option set. Furthermore, if available, bind_port()
will set the SO_EXCLUSIVEADDRUSE option on the socket it's been passed.
This currently only applies to Windows. This option prevents any other
sockets from binding to the host/port we've bound to, thus removing the
possibility of the 'non-deterministic' behaviour, as Microsoft puts it,
that occurs when a second SOCK_STREAM socket binds and accepts to a
host/port that's already been bound by another socket. The optional
preferred port parameter to bind_port() has been removed. Under no
circumstances should tests be hard coding ports!
test_support.find_unused_port() has also been introduced, which will pass
a temporary socket object to bind_port() in order to obtain an unused port.
The temporary socket object is then closed and deleted, and the port is
returned. This method should only be used for obtaining an unused port
in order to pass to an external program (i.e. the -accept [port] argument
to openssl's s_server mode) or as a parameter to a server-oriented class
that doesn't give you direct access to the underlying socket used.
Finally, test_support.HOST has been introduced, which should be used for
the host argument of any relevant socket calls (i.e. bind and connect).
The following tests were updated to following the new conventions:
test_socket, test_smtplib, test_asyncore, test_ssl, test_httplib,
test_poplib, test_ftplib, test_telnetlib, test_socketserver,
test_asynchat and test_socket_ssl.
It is now possible for multiple instances of the regression test suite to
run in parallel without issue.
........
r62235 | gregory.p.smith | 2008-04-09 02:25:17 +0200 (Wed, 09 Apr 2008) | 3 lines
Fix zlib crash from zlib.decompressobj().flush(val) when val was not positive.
It tried to allocate negative or zero memory. That fails.
........
r62237 | trent.nelson | 2008-04-09 02:34:53 +0200 (Wed, 09 Apr 2008) | 1 line
Fix typo with regards to self.PORT shadowing class variables with the same name.
........
r62238 | andrew.kuchling | 2008-04-09 03:08:32 +0200 (Wed, 09 Apr 2008) | 1 line
Add items
........
r62239 | jerry.seutter | 2008-04-09 07:07:58 +0200 (Wed, 09 Apr 2008) | 1 line
Changed test so it no longer runs as a side effect of importing.
........
2008-04-09 05:37:03 -03:00
|
|
|
|
import sre_parse
|
2000-03-31 10:58:54 -04:00
|
|
|
|
from sre_constants import *
|
|
|
|
|
|
2001-01-15 08:46:09 -04:00
|
|
|
|
assert _sre.MAGIC == MAGIC, "SRE module mismatch"
|
|
|
|
|
|
2014-11-09 19:56:33 -04:00
|
|
|
|
_LITERAL_CODES = {LITERAL, NOT_LITERAL}
|
|
|
|
|
_REPEATING_CODES = {REPEAT, MIN_REPEAT, MAX_REPEAT}
|
|
|
|
|
_SUCCESS_CODES = {SUCCESS, FAILURE}
|
|
|
|
|
_ASSERT_CODES = {ASSERT, ASSERT_NOT}
|
2005-02-28 15:27:52 -04:00
|
|
|
|
|
2014-11-10 06:37:16 -04:00
|
|
|
|
# Sets of lowercase characters which have the same uppercase.
|
|
|
|
|
_equivalences = (
|
|
|
|
|
# LATIN SMALL LETTER I, LATIN SMALL LETTER DOTLESS I
|
|
|
|
|
(0x69, 0x131), # iı
|
|
|
|
|
# LATIN SMALL LETTER S, LATIN SMALL LETTER LONG S
|
|
|
|
|
(0x73, 0x17f), # sſ
|
|
|
|
|
# MICRO SIGN, GREEK SMALL LETTER MU
|
|
|
|
|
(0xb5, 0x3bc), # µμ
|
|
|
|
|
# COMBINING GREEK YPOGEGRAMMENI, GREEK SMALL LETTER IOTA, GREEK PROSGEGRAMMENI
|
|
|
|
|
(0x345, 0x3b9, 0x1fbe), # \u0345ιι
|
|
|
|
|
# GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS, GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA
|
|
|
|
|
(0x390, 0x1fd3), # ΐΐ
|
|
|
|
|
# GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS, GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA
|
|
|
|
|
(0x3b0, 0x1fe3), # ΰΰ
|
|
|
|
|
# GREEK SMALL LETTER BETA, GREEK BETA SYMBOL
|
|
|
|
|
(0x3b2, 0x3d0), # βϐ
|
|
|
|
|
# GREEK SMALL LETTER EPSILON, GREEK LUNATE EPSILON SYMBOL
|
|
|
|
|
(0x3b5, 0x3f5), # εϵ
|
|
|
|
|
# GREEK SMALL LETTER THETA, GREEK THETA SYMBOL
|
|
|
|
|
(0x3b8, 0x3d1), # θϑ
|
|
|
|
|
# GREEK SMALL LETTER KAPPA, GREEK KAPPA SYMBOL
|
|
|
|
|
(0x3ba, 0x3f0), # κϰ
|
|
|
|
|
# GREEK SMALL LETTER PI, GREEK PI SYMBOL
|
|
|
|
|
(0x3c0, 0x3d6), # πϖ
|
|
|
|
|
# GREEK SMALL LETTER RHO, GREEK RHO SYMBOL
|
|
|
|
|
(0x3c1, 0x3f1), # ρϱ
|
|
|
|
|
# GREEK SMALL LETTER FINAL SIGMA, GREEK SMALL LETTER SIGMA
|
|
|
|
|
(0x3c2, 0x3c3), # ςσ
|
|
|
|
|
# GREEK SMALL LETTER PHI, GREEK PHI SYMBOL
|
|
|
|
|
(0x3c6, 0x3d5), # φϕ
|
|
|
|
|
# LATIN SMALL LETTER S WITH DOT ABOVE, LATIN SMALL LETTER LONG S WITH DOT ABOVE
|
|
|
|
|
(0x1e61, 0x1e9b), # ṡẛ
|
|
|
|
|
# LATIN SMALL LIGATURE LONG S T, LATIN SMALL LIGATURE ST
|
|
|
|
|
(0xfb05, 0xfb06), # ſtst
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
# Maps the lowercase code to lowercase codes which have the same uppercase.
|
|
|
|
|
_ignorecase_fixes = {i: tuple(j for j in t if i != j)
|
|
|
|
|
for t in _equivalences for i in t}
|
|
|
|
|
|
2000-06-29 05:58:44 -03:00
|
|
|
|
def _compile(code, pattern, flags):
|
2000-06-29 20:33:12 -03:00
|
|
|
|
# internal: compile a (sub)pattern
|
2000-06-29 13:57:40 -03:00
|
|
|
|
emit = code.append
|
2004-03-26 07:16:55 -04:00
|
|
|
|
_len = len
|
2005-02-28 15:27:52 -04:00
|
|
|
|
LITERAL_CODES = _LITERAL_CODES
|
|
|
|
|
REPEATING_CODES = _REPEATING_CODES
|
|
|
|
|
SUCCESS_CODES = _SUCCESS_CODES
|
|
|
|
|
ASSERT_CODES = _ASSERT_CODES
|
2014-11-10 06:37:16 -04:00
|
|
|
|
if (flags & SRE_FLAG_IGNORECASE and
|
|
|
|
|
not (flags & SRE_FLAG_LOCALE) and
|
2016-09-09 18:57:55 -03:00
|
|
|
|
flags & SRE_FLAG_UNICODE and
|
|
|
|
|
not (flags & SRE_FLAG_ASCII)):
|
2014-11-10 06:37:16 -04:00
|
|
|
|
fixes = _ignorecase_fixes
|
|
|
|
|
else:
|
|
|
|
|
fixes = None
|
2000-03-31 10:58:54 -04:00
|
|
|
|
for op, av in pattern:
|
2004-03-26 07:16:55 -04:00
|
|
|
|
if op in LITERAL_CODES:
|
2000-06-30 04:50:59 -03:00
|
|
|
|
if flags & SRE_FLAG_IGNORECASE:
|
2014-11-10 06:37:16 -04:00
|
|
|
|
lo = _sre.getlower(av, flags)
|
|
|
|
|
if fixes and lo in fixes:
|
2014-11-10 06:43:14 -04:00
|
|
|
|
emit(IN_IGNORE)
|
2014-11-10 06:37:16 -04:00
|
|
|
|
skip = _len(code); emit(0)
|
|
|
|
|
if op is NOT_LITERAL:
|
2014-11-10 06:43:14 -04:00
|
|
|
|
emit(NEGATE)
|
2014-11-10 06:37:16 -04:00
|
|
|
|
for k in (lo,) + fixes[lo]:
|
2014-11-10 06:43:14 -04:00
|
|
|
|
emit(LITERAL)
|
2014-11-10 06:37:16 -04:00
|
|
|
|
emit(k)
|
2014-11-10 06:43:14 -04:00
|
|
|
|
emit(FAILURE)
|
2014-11-10 06:37:16 -04:00
|
|
|
|
code[skip] = _len(code) - skip
|
|
|
|
|
else:
|
2014-11-10 06:43:14 -04:00
|
|
|
|
emit(OP_IGNORE[op])
|
2014-11-10 06:37:16 -04:00
|
|
|
|
emit(lo)
|
2000-06-30 04:50:59 -03:00
|
|
|
|
else:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(op)
|
2001-01-15 14:28:14 -04:00
|
|
|
|
emit(av)
|
2000-06-30 04:50:59 -03:00
|
|
|
|
elif op is IN:
|
|
|
|
|
if flags & SRE_FLAG_IGNORECASE:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(OP_IGNORE[op])
|
2000-06-30 04:50:59 -03:00
|
|
|
|
def fixup(literal, flags=flags):
|
2000-06-30 10:55:15 -03:00
|
|
|
|
return _sre.getlower(literal, flags)
|
2000-06-30 04:50:59 -03:00
|
|
|
|
else:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(op)
|
2014-10-31 07:36:56 -03:00
|
|
|
|
fixup = None
|
2004-03-26 07:16:55 -04:00
|
|
|
|
skip = _len(code); emit(0)
|
2014-11-10 06:37:16 -04:00
|
|
|
|
_compile_charset(av, flags, code, fixup, fixes)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
code[skip] = _len(code) - skip
|
2000-06-30 07:41:31 -03:00
|
|
|
|
elif op is ANY:
|
|
|
|
|
if flags & SRE_FLAG_DOTALL:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(ANY_ALL)
|
2000-06-30 07:41:31 -03:00
|
|
|
|
else:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(ANY)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
elif op in REPEATING_CODES:
|
2000-06-30 04:50:59 -03:00
|
|
|
|
if flags & SRE_FLAG_TEMPLATE:
|
2015-03-25 16:03:47 -03:00
|
|
|
|
raise error("internal: unsupported template operator %r" % (op,))
|
2004-03-26 07:16:55 -04:00
|
|
|
|
elif _simple(av) and op is not REPEAT:
|
|
|
|
|
if op is MAX_REPEAT:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(REPEAT_ONE)
|
2003-04-14 14:59:34 -03:00
|
|
|
|
else:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(MIN_REPEAT_ONE)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
skip = _len(code); emit(0)
|
2000-08-01 19:47:49 -03:00
|
|
|
|
emit(av[0])
|
|
|
|
|
emit(av[1])
|
|
|
|
|
_compile(code, av[2], flags)
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(SUCCESS)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
code[skip] = _len(code) - skip
|
2000-06-30 04:50:59 -03:00
|
|
|
|
else:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(REPEAT)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
skip = _len(code); emit(0)
|
2000-08-01 19:47:49 -03:00
|
|
|
|
emit(av[0])
|
|
|
|
|
emit(av[1])
|
|
|
|
|
_compile(code, av[2], flags)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
code[skip] = _len(code) - skip
|
|
|
|
|
if op is MAX_REPEAT:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(MAX_UNTIL)
|
2000-06-30 04:50:59 -03:00
|
|
|
|
else:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(MIN_UNTIL)
|
2000-06-30 04:50:59 -03:00
|
|
|
|
elif op is SUBPATTERN:
|
2016-09-09 18:57:55 -03:00
|
|
|
|
group, add_flags, del_flags, p = av
|
|
|
|
|
if group:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(MARK)
|
2016-09-09 18:57:55 -03:00
|
|
|
|
emit((group-1)*2)
|
|
|
|
|
# _compile_info(code, p, (flags | add_flags) & ~del_flags)
|
|
|
|
|
_compile(code, p, (flags | add_flags) & ~del_flags)
|
|
|
|
|
if group:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(MARK)
|
2016-09-09 18:57:55 -03:00
|
|
|
|
emit((group-1)*2+1)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
elif op in SUCCESS_CODES:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(op)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
elif op in ASSERT_CODES:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(op)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
skip = _len(code); emit(0)
|
2000-07-03 15:44:21 -03:00
|
|
|
|
if av[0] >= 0:
|
|
|
|
|
emit(0) # look ahead
|
|
|
|
|
else:
|
|
|
|
|
lo, hi = av[1].getwidth()
|
|
|
|
|
if lo != hi:
|
2007-08-29 22:19:48 -03:00
|
|
|
|
raise error("look-behind requires fixed-width pattern")
|
2000-07-03 15:44:21 -03:00
|
|
|
|
emit(lo) # look behind
|
|
|
|
|
_compile(code, av[1], flags)
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(SUCCESS)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
code[skip] = _len(code) - skip
|
2000-07-03 15:44:21 -03:00
|
|
|
|
elif op is CALL:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(op)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
skip = _len(code); emit(0)
|
2000-06-30 07:41:31 -03:00
|
|
|
|
_compile(code, av, flags)
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(SUCCESS)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
code[skip] = _len(code) - skip
|
2000-06-30 07:41:31 -03:00
|
|
|
|
elif op is AT:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(op)
|
2000-06-30 07:41:31 -03:00
|
|
|
|
if flags & SRE_FLAG_MULTILINE:
|
2001-03-22 11:50:10 -04:00
|
|
|
|
av = AT_MULTILINE.get(av, av)
|
|
|
|
|
if flags & SRE_FLAG_LOCALE:
|
|
|
|
|
av = AT_LOCALE.get(av, av)
|
2016-09-09 18:57:55 -03:00
|
|
|
|
elif (flags & SRE_FLAG_UNICODE) and not (flags & SRE_FLAG_ASCII):
|
2001-03-22 11:50:10 -04:00
|
|
|
|
av = AT_UNICODE.get(av, av)
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(av)
|
2000-06-30 07:41:31 -03:00
|
|
|
|
elif op is BRANCH:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(op)
|
2000-06-30 07:41:31 -03:00
|
|
|
|
tail = []
|
2004-03-26 07:16:55 -04:00
|
|
|
|
tailappend = tail.append
|
2000-06-30 07:41:31 -03:00
|
|
|
|
for av in av[1]:
|
2004-03-26 07:16:55 -04:00
|
|
|
|
skip = _len(code); emit(0)
|
2000-08-07 17:59:04 -03:00
|
|
|
|
# _compile_info(code, av, flags)
|
2000-06-30 07:41:31 -03:00
|
|
|
|
_compile(code, av, flags)
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(JUMP)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
tailappend(_len(code)); emit(0)
|
|
|
|
|
code[skip] = _len(code) - skip
|
2014-11-11 15:13:28 -04:00
|
|
|
|
emit(FAILURE) # end of branch
|
2000-06-30 07:41:31 -03:00
|
|
|
|
for tail in tail:
|
2004-03-26 07:16:55 -04:00
|
|
|
|
code[tail] = _len(code) - tail
|
2000-06-30 07:41:31 -03:00
|
|
|
|
elif op is CATEGORY:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(op)
|
2000-06-30 07:41:31 -03:00
|
|
|
|
if flags & SRE_FLAG_LOCALE:
|
2001-03-22 11:50:10 -04:00
|
|
|
|
av = CH_LOCALE[av]
|
2016-09-09 18:57:55 -03:00
|
|
|
|
elif (flags & SRE_FLAG_UNICODE) and not (flags & SRE_FLAG_ASCII):
|
2001-03-22 11:50:10 -04:00
|
|
|
|
av = CH_UNICODE[av]
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(av)
|
2000-07-03 18:31:48 -03:00
|
|
|
|
elif op is GROUPREF:
|
2000-06-30 07:41:31 -03:00
|
|
|
|
if flags & SRE_FLAG_IGNORECASE:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(OP_IGNORE[op])
|
2000-06-30 07:41:31 -03:00
|
|
|
|
else:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(op)
|
2000-06-30 07:41:31 -03:00
|
|
|
|
emit(av-1)
|
2003-10-17 19:13:16 -03:00
|
|
|
|
elif op is GROUPREF_EXISTS:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(op)
|
2005-06-02 10:35:52 -03:00
|
|
|
|
emit(av[0]-1)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
skipyes = _len(code); emit(0)
|
2003-10-17 19:13:16 -03:00
|
|
|
|
_compile(code, av[1], flags)
|
|
|
|
|
if av[2]:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(JUMP)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
skipno = _len(code); emit(0)
|
|
|
|
|
code[skipyes] = _len(code) - skipyes + 1
|
2003-10-17 19:13:16 -03:00
|
|
|
|
_compile(code, av[2], flags)
|
2004-03-26 07:16:55 -04:00
|
|
|
|
code[skipno] = _len(code) - skipno
|
2003-10-17 19:13:16 -03:00
|
|
|
|
else:
|
2004-03-26 07:16:55 -04:00
|
|
|
|
code[skipyes] = _len(code) - skipyes + 1
|
2000-06-30 04:50:59 -03:00
|
|
|
|
else:
|
2015-03-25 16:03:47 -03:00
|
|
|
|
raise error("internal: unsupported operand type %r" % (op,))
|
2000-03-31 10:58:54 -04:00
|
|
|
|
|
2014-11-10 06:37:16 -04:00
|
|
|
|
def _compile_charset(charset, flags, code, fixup=None, fixes=None):
|
2000-08-07 17:59:04 -03:00
|
|
|
|
# compile charset subprogram
|
|
|
|
|
emit = code.append
|
2014-11-10 06:43:14 -04:00
|
|
|
|
for op, av in _optimize_charset(charset, fixup, fixes):
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(op)
|
2000-08-07 17:59:04 -03:00
|
|
|
|
if op is NEGATE:
|
|
|
|
|
pass
|
|
|
|
|
elif op is LITERAL:
|
2014-10-31 07:36:56 -03:00
|
|
|
|
emit(av)
|
|
|
|
|
elif op is RANGE or op is RANGE_IGNORE:
|
|
|
|
|
emit(av[0])
|
|
|
|
|
emit(av[1])
|
2000-08-07 17:59:04 -03:00
|
|
|
|
elif op is CHARSET:
|
|
|
|
|
code.extend(av)
|
2001-07-02 13:58:38 -03:00
|
|
|
|
elif op is BIGCHARSET:
|
|
|
|
|
code.extend(av)
|
2000-08-07 17:59:04 -03:00
|
|
|
|
elif op is CATEGORY:
|
|
|
|
|
if flags & SRE_FLAG_LOCALE:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(CH_LOCALE[av])
|
2016-09-09 18:57:55 -03:00
|
|
|
|
elif (flags & SRE_FLAG_UNICODE) and not (flags & SRE_FLAG_ASCII):
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(CH_UNICODE[av])
|
2000-08-07 17:59:04 -03:00
|
|
|
|
else:
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(av)
|
2000-08-07 17:59:04 -03:00
|
|
|
|
else:
|
2015-03-25 16:03:47 -03:00
|
|
|
|
raise error("internal: unsupported set operator %r" % (op,))
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(FAILURE)
|
2000-08-07 17:59:04 -03:00
|
|
|
|
|
2014-11-10 06:43:14 -04:00
|
|
|
|
def _optimize_charset(charset, fixup, fixes):
|
2000-08-07 17:59:04 -03:00
|
|
|
|
# internal: optimize character set
|
|
|
|
|
out = []
|
2013-10-27 03:20:29 -03:00
|
|
|
|
tail = []
|
|
|
|
|
charmap = bytearray(256)
|
|
|
|
|
for op, av in charset:
|
|
|
|
|
while True:
|
|
|
|
|
try:
|
|
|
|
|
if op is LITERAL:
|
2014-10-31 07:36:56 -03:00
|
|
|
|
if fixup:
|
2014-11-10 06:43:14 -04:00
|
|
|
|
lo = fixup(av)
|
|
|
|
|
charmap[lo] = 1
|
|
|
|
|
if fixes and lo in fixes:
|
|
|
|
|
for k in fixes[lo]:
|
2014-11-10 06:37:16 -04:00
|
|
|
|
charmap[k] = 1
|
|
|
|
|
else:
|
|
|
|
|
charmap[av] = 1
|
2013-10-27 03:20:29 -03:00
|
|
|
|
elif op is RANGE:
|
2014-10-31 07:36:56 -03:00
|
|
|
|
r = range(av[0], av[1]+1)
|
|
|
|
|
if fixup:
|
|
|
|
|
r = map(fixup, r)
|
2014-11-10 06:37:16 -04:00
|
|
|
|
if fixup and fixes:
|
|
|
|
|
for i in r:
|
|
|
|
|
charmap[i] = 1
|
|
|
|
|
if i in fixes:
|
|
|
|
|
for k in fixes[i]:
|
|
|
|
|
charmap[k] = 1
|
|
|
|
|
else:
|
|
|
|
|
for i in r:
|
|
|
|
|
charmap[i] = 1
|
2013-10-27 03:20:29 -03:00
|
|
|
|
elif op is NEGATE:
|
|
|
|
|
out.append((op, av))
|
|
|
|
|
else:
|
|
|
|
|
tail.append((op, av))
|
|
|
|
|
except IndexError:
|
|
|
|
|
if len(charmap) == 256:
|
|
|
|
|
# character set contains non-UCS1 character codes
|
|
|
|
|
charmap += b'\0' * 0xff00
|
|
|
|
|
continue
|
2014-10-31 07:36:56 -03:00
|
|
|
|
# Character set contains non-BMP character codes.
|
|
|
|
|
# There are only two ranges of cased non-BMP characters:
|
|
|
|
|
# 10400-1044F (Deseret) and 118A0-118DF (Warang Citi),
|
|
|
|
|
# and for both ranges RANGE_IGNORE works.
|
|
|
|
|
if fixup and op is RANGE:
|
|
|
|
|
op = RANGE_IGNORE
|
2013-10-27 03:20:29 -03:00
|
|
|
|
tail.append((op, av))
|
|
|
|
|
break
|
|
|
|
|
|
2000-08-07 17:59:04 -03:00
|
|
|
|
# compress character map
|
|
|
|
|
runs = []
|
2013-10-27 03:20:29 -03:00
|
|
|
|
q = 0
|
|
|
|
|
while True:
|
|
|
|
|
p = charmap.find(1, q)
|
|
|
|
|
if p < 0:
|
|
|
|
|
break
|
|
|
|
|
if len(runs) >= 2:
|
|
|
|
|
runs = None
|
|
|
|
|
break
|
|
|
|
|
q = charmap.find(0, p)
|
|
|
|
|
if q < 0:
|
|
|
|
|
runs.append((p, len(charmap)))
|
|
|
|
|
break
|
|
|
|
|
runs.append((p, q))
|
|
|
|
|
if runs is not None:
|
2000-08-07 17:59:04 -03:00
|
|
|
|
# use literal/range
|
2013-10-27 03:20:29 -03:00
|
|
|
|
for p, q in runs:
|
|
|
|
|
if q - p == 1:
|
|
|
|
|
out.append((LITERAL, p))
|
2000-08-07 17:59:04 -03:00
|
|
|
|
else:
|
2013-10-27 03:20:29 -03:00
|
|
|
|
out.append((RANGE, (p, q - 1)))
|
|
|
|
|
out += tail
|
2014-10-31 07:36:56 -03:00
|
|
|
|
# if the case was changed or new representation is more compact
|
|
|
|
|
if fixup or len(out) < len(charset):
|
2000-08-07 17:59:04 -03:00
|
|
|
|
return out
|
2014-10-31 07:36:56 -03:00
|
|
|
|
# else original character set is good enough
|
2013-10-27 03:20:29 -03:00
|
|
|
|
return charset
|
|
|
|
|
|
|
|
|
|
# use bitmap
|
|
|
|
|
if len(charmap) == 256:
|
2001-07-02 13:58:38 -03:00
|
|
|
|
data = _mk_bitmap(charmap)
|
2013-10-27 03:20:29 -03:00
|
|
|
|
out.append((CHARSET, data))
|
|
|
|
|
out += tail
|
2000-08-07 17:59:04 -03:00
|
|
|
|
return out
|
2001-07-02 13:58:38 -03:00
|
|
|
|
|
2013-10-27 03:20:29 -03:00
|
|
|
|
# To represent a big charset, first a bitmap of all characters in the
|
|
|
|
|
# set is constructed. Then, this bitmap is sliced into chunks of 256
|
|
|
|
|
# characters, duplicate chunks are eliminated, and each chunk is
|
|
|
|
|
# given a number. In the compiled expression, the charset is
|
|
|
|
|
# represented by a 32-bit word sequence, consisting of one word for
|
|
|
|
|
# the number of different chunks, a sequence of 256 bytes (64 words)
|
|
|
|
|
# of chunk numbers indexed by their original chunk position, and a
|
|
|
|
|
# sequence of 256-bit chunks (8 words each).
|
2001-07-02 13:58:38 -03:00
|
|
|
|
|
2013-10-27 03:20:29 -03:00
|
|
|
|
# Compression is normally good: in a typical charset, large ranges of
|
|
|
|
|
# Unicode will be either completely excluded (e.g. if only cyrillic
|
|
|
|
|
# letters are to be matched), or completely included (e.g. if large
|
|
|
|
|
# subranges of Kanji match). These ranges will be represented by
|
|
|
|
|
# chunks of all one-bits or all zero-bits.
|
2001-07-02 13:58:38 -03:00
|
|
|
|
|
2013-10-27 03:20:29 -03:00
|
|
|
|
# Matching can be also done efficiently: the more significant byte of
|
|
|
|
|
# the Unicode character is an index into the chunk number, and the
|
|
|
|
|
# less significant byte is a bit index in the chunk (just like the
|
|
|
|
|
# CHARSET matching).
|
2003-04-19 09:56:08 -03:00
|
|
|
|
|
2013-10-27 03:20:29 -03:00
|
|
|
|
charmap = bytes(charmap) # should be hashable
|
2001-07-02 13:58:38 -03:00
|
|
|
|
comps = {}
|
2013-10-27 03:20:29 -03:00
|
|
|
|
mapping = bytearray(256)
|
2001-07-02 13:58:38 -03:00
|
|
|
|
block = 0
|
2013-10-27 03:20:29 -03:00
|
|
|
|
data = bytearray()
|
|
|
|
|
for i in range(0, 65536, 256):
|
|
|
|
|
chunk = charmap[i: i + 256]
|
|
|
|
|
if chunk in comps:
|
|
|
|
|
mapping[i // 256] = comps[chunk]
|
|
|
|
|
else:
|
|
|
|
|
mapping[i // 256] = comps[chunk] = block
|
|
|
|
|
block += 1
|
|
|
|
|
data += chunk
|
|
|
|
|
data = _mk_bitmap(data)
|
|
|
|
|
data[0:0] = [block] + _bytes_to_codes(mapping)
|
|
|
|
|
out.append((BIGCHARSET, data))
|
|
|
|
|
out += tail
|
|
|
|
|
return out
|
|
|
|
|
|
|
|
|
|
_CODEBITS = _sre.CODESIZE * 8
|
2014-11-11 15:13:28 -04:00
|
|
|
|
MAXCODE = (1 << _CODEBITS) - 1
|
2013-10-27 03:20:29 -03:00
|
|
|
|
_BITS_TRANS = b'0' + b'1' * 255
|
|
|
|
|
def _mk_bitmap(bits, _CODEBITS=_CODEBITS, _int=int):
|
|
|
|
|
s = bits.translate(_BITS_TRANS)[::-1]
|
|
|
|
|
return [_int(s[i - _CODEBITS: i], 2)
|
|
|
|
|
for i in range(len(s), 0, -_CODEBITS)]
|
|
|
|
|
|
|
|
|
|
def _bytes_to_codes(b):
|
|
|
|
|
# Convert block indices to word array
|
2014-11-10 07:24:47 -04:00
|
|
|
|
a = memoryview(b).cast('I')
|
2013-10-27 03:20:29 -03:00
|
|
|
|
assert a.itemsize == _sre.CODESIZE
|
|
|
|
|
assert len(a) * a.itemsize == len(b)
|
|
|
|
|
return a.tolist()
|
2001-07-02 13:58:38 -03:00
|
|
|
|
|
2000-08-07 17:59:04 -03:00
|
|
|
|
def _simple(av):
|
|
|
|
|
# check if av is a "simple" operator
|
|
|
|
|
lo, hi = av[2].getwidth()
|
|
|
|
|
return lo == hi == 1 and av[2][0][0] != SUBPATTERN
|
|
|
|
|
|
2013-10-25 16:36:10 -03:00
|
|
|
|
def _generate_overlap_table(prefix):
|
|
|
|
|
"""
|
|
|
|
|
Generate an overlap table for the following prefix.
|
|
|
|
|
An overlap table is a table of the same size as the prefix which
|
|
|
|
|
informs about the potential self-overlap for each index in the prefix:
|
|
|
|
|
- if overlap[i] == 0, prefix[i:] can't overlap prefix[0:...]
|
|
|
|
|
- if overlap[i] == k with 0 < k <= i, prefix[i-k+1:i+1] overlaps with
|
|
|
|
|
prefix[0:k]
|
|
|
|
|
"""
|
|
|
|
|
table = [0] * len(prefix)
|
|
|
|
|
for i in range(1, len(prefix)):
|
|
|
|
|
idx = table[i - 1]
|
|
|
|
|
while prefix[i] != prefix[idx]:
|
|
|
|
|
if idx == 0:
|
|
|
|
|
table[i] = 0
|
|
|
|
|
break
|
|
|
|
|
idx = table[idx - 1]
|
|
|
|
|
else:
|
|
|
|
|
table[i] = idx + 1
|
|
|
|
|
return table
|
|
|
|
|
|
2015-06-21 08:06:55 -03:00
|
|
|
|
def _get_literal_prefix(pattern):
|
|
|
|
|
# look for literal prefix
|
2000-06-29 20:33:12 -03:00
|
|
|
|
prefix = []
|
2004-03-26 07:16:55 -04:00
|
|
|
|
prefixappend = prefix.append
|
2015-06-21 08:06:55 -03:00
|
|
|
|
prefix_skip = None
|
|
|
|
|
for op, av in pattern.data:
|
|
|
|
|
if op is LITERAL:
|
|
|
|
|
prefixappend(av)
|
|
|
|
|
elif op is SUBPATTERN:
|
2016-09-09 18:57:55 -03:00
|
|
|
|
group, add_flags, del_flags, p = av
|
|
|
|
|
if add_flags & SRE_FLAG_IGNORECASE:
|
|
|
|
|
break
|
|
|
|
|
prefix1, prefix_skip1, got_all = _get_literal_prefix(p)
|
2015-06-21 08:06:55 -03:00
|
|
|
|
if prefix_skip is None:
|
2016-09-09 18:57:55 -03:00
|
|
|
|
if group is not None:
|
2015-06-21 08:06:55 -03:00
|
|
|
|
prefix_skip = len(prefix)
|
|
|
|
|
elif prefix_skip1 is not None:
|
|
|
|
|
prefix_skip = len(prefix) + prefix_skip1
|
|
|
|
|
prefix.extend(prefix1)
|
|
|
|
|
if not got_all:
|
|
|
|
|
break
|
|
|
|
|
else:
|
|
|
|
|
break
|
2016-09-09 18:57:55 -03:00
|
|
|
|
else:
|
|
|
|
|
return prefix, prefix_skip, True
|
|
|
|
|
return prefix, prefix_skip, False
|
2015-06-21 08:06:55 -03:00
|
|
|
|
|
|
|
|
|
def _get_charset_prefix(pattern):
|
2000-07-02 09:00:07 -03:00
|
|
|
|
charset = [] # not used
|
2004-03-26 07:16:55 -04:00
|
|
|
|
charsetappend = charset.append
|
2015-06-21 08:06:55 -03:00
|
|
|
|
if pattern.data:
|
|
|
|
|
op, av = pattern.data[0]
|
2016-09-09 18:57:55 -03:00
|
|
|
|
if op is SUBPATTERN:
|
|
|
|
|
group, add_flags, del_flags, p = av
|
|
|
|
|
if p and not (add_flags & SRE_FLAG_IGNORECASE):
|
|
|
|
|
op, av = p[0]
|
|
|
|
|
if op is LITERAL:
|
|
|
|
|
charsetappend((op, av))
|
|
|
|
|
elif op is BRANCH:
|
|
|
|
|
c = []
|
|
|
|
|
cappend = c.append
|
|
|
|
|
for p in av[1]:
|
|
|
|
|
if not p:
|
|
|
|
|
break
|
|
|
|
|
op, av = p[0]
|
|
|
|
|
if op is LITERAL:
|
|
|
|
|
cappend((op, av))
|
|
|
|
|
else:
|
|
|
|
|
break
|
2000-08-07 17:59:04 -03:00
|
|
|
|
else:
|
2016-09-09 18:57:55 -03:00
|
|
|
|
charset = c
|
2015-06-21 08:06:55 -03:00
|
|
|
|
elif op is BRANCH:
|
|
|
|
|
c = []
|
|
|
|
|
cappend = c.append
|
|
|
|
|
for p in av[1]:
|
|
|
|
|
if not p:
|
|
|
|
|
break
|
|
|
|
|
op, av = p[0]
|
|
|
|
|
if op is LITERAL:
|
|
|
|
|
cappend((op, av))
|
|
|
|
|
else:
|
|
|
|
|
break
|
|
|
|
|
else:
|
|
|
|
|
charset = c
|
|
|
|
|
elif op is IN:
|
|
|
|
|
charset = av
|
|
|
|
|
return charset
|
|
|
|
|
|
|
|
|
|
def _compile_info(code, pattern, flags):
|
|
|
|
|
# internal: compile an info block. in the current version,
|
|
|
|
|
# this contains min/max pattern width, and an optional literal
|
|
|
|
|
# prefix or a character map
|
|
|
|
|
lo, hi = pattern.getwidth()
|
|
|
|
|
if hi > MAXCODE:
|
|
|
|
|
hi = MAXCODE
|
|
|
|
|
if lo == 0:
|
|
|
|
|
code.extend([INFO, 4, 0, lo, hi])
|
|
|
|
|
return
|
|
|
|
|
# look for a literal prefix
|
|
|
|
|
prefix = []
|
|
|
|
|
prefix_skip = 0
|
|
|
|
|
charset = [] # not used
|
|
|
|
|
if not (flags & SRE_FLAG_IGNORECASE):
|
|
|
|
|
# look for literal prefix
|
|
|
|
|
prefix, prefix_skip, got_all = _get_literal_prefix(pattern)
|
|
|
|
|
# if no prefix, look for charset prefix
|
|
|
|
|
if not prefix:
|
|
|
|
|
charset = _get_charset_prefix(pattern)
|
2000-08-07 17:59:04 -03:00
|
|
|
|
## if prefix:
|
2014-11-11 15:13:28 -04:00
|
|
|
|
## print("*** PREFIX", prefix, prefix_skip)
|
2000-08-07 17:59:04 -03:00
|
|
|
|
## if charset:
|
2014-11-11 15:13:28 -04:00
|
|
|
|
## print("*** CHARSET", charset)
|
2000-06-29 20:33:12 -03:00
|
|
|
|
# add an info block
|
|
|
|
|
emit = code.append
|
2014-11-09 14:48:36 -04:00
|
|
|
|
emit(INFO)
|
2000-06-29 20:33:12 -03:00
|
|
|
|
skip = len(code); emit(0)
|
|
|
|
|
# literal flag
|
|
|
|
|
mask = 0
|
2000-07-02 09:00:07 -03:00
|
|
|
|
if prefix:
|
|
|
|
|
mask = SRE_INFO_PREFIX
|
2015-06-21 08:06:55 -03:00
|
|
|
|
if prefix_skip is None and got_all:
|
2014-11-11 15:13:28 -04:00
|
|
|
|
mask = mask | SRE_INFO_LITERAL
|
2000-07-02 09:00:07 -03:00
|
|
|
|
elif charset:
|
2014-11-11 15:13:28 -04:00
|
|
|
|
mask = mask | SRE_INFO_CHARSET
|
2000-06-29 20:33:12 -03:00
|
|
|
|
emit(mask)
|
|
|
|
|
# pattern length
|
2000-07-02 09:00:07 -03:00
|
|
|
|
if lo < MAXCODE:
|
|
|
|
|
emit(lo)
|
|
|
|
|
else:
|
|
|
|
|
emit(MAXCODE)
|
|
|
|
|
prefix = prefix[:MAXCODE]
|
2015-02-03 05:04:19 -04:00
|
|
|
|
emit(min(hi, MAXCODE))
|
2000-06-29 20:33:12 -03:00
|
|
|
|
# add literal prefix
|
|
|
|
|
if prefix:
|
2000-08-07 17:59:04 -03:00
|
|
|
|
emit(len(prefix)) # length
|
2015-06-21 08:06:55 -03:00
|
|
|
|
if prefix_skip is None:
|
|
|
|
|
prefix_skip = len(prefix)
|
2000-08-07 17:59:04 -03:00
|
|
|
|
emit(prefix_skip) # skip
|
|
|
|
|
code.extend(prefix)
|
|
|
|
|
# generate overlap table
|
2013-10-25 16:36:10 -03:00
|
|
|
|
code.extend(_generate_overlap_table(prefix))
|
2000-07-02 09:00:07 -03:00
|
|
|
|
elif charset:
|
2003-02-23 21:18:35 -04:00
|
|
|
|
_compile_charset(charset, flags, code)
|
2000-06-29 20:33:12 -03:00
|
|
|
|
code[skip] = len(code) - skip
|
|
|
|
|
|
2003-07-02 18:37:16 -03:00
|
|
|
|
def isstring(obj):
|
2008-03-18 17:19:54 -03:00
|
|
|
|
return isinstance(obj, (str, bytes))
|
2003-07-02 18:37:16 -03:00
|
|
|
|
|
2000-08-01 18:05:41 -03:00
|
|
|
|
def _code(p, flags):
|
2000-06-29 20:33:12 -03:00
|
|
|
|
|
2000-06-01 14:39:12 -03:00
|
|
|
|
flags = p.pattern.flags | flags
|
2000-06-29 13:57:40 -03:00
|
|
|
|
code = []
|
2000-06-29 20:33:12 -03:00
|
|
|
|
|
|
|
|
|
# compile info block
|
|
|
|
|
_compile_info(code, p, flags)
|
|
|
|
|
|
|
|
|
|
# compile the pattern
|
2000-06-01 14:39:12 -03:00
|
|
|
|
_compile(code, p.data, flags)
|
2000-06-29 20:33:12 -03:00
|
|
|
|
|
2014-11-09 14:48:36 -04:00
|
|
|
|
code.append(SUCCESS)
|
2000-06-29 20:33:12 -03:00
|
|
|
|
|
2000-08-01 15:20:07 -03:00
|
|
|
|
return code
|
|
|
|
|
|
|
|
|
|
def compile(p, flags=0):
|
|
|
|
|
# internal: convert pattern list to internal format
|
|
|
|
|
|
2003-07-02 18:37:16 -03:00
|
|
|
|
if isstring(p):
|
2000-08-01 15:20:07 -03:00
|
|
|
|
pattern = p
|
|
|
|
|
p = sre_parse.parse(p, flags)
|
|
|
|
|
else:
|
|
|
|
|
pattern = None
|
|
|
|
|
|
2000-08-01 18:05:41 -03:00
|
|
|
|
code = _code(p, flags)
|
2000-08-01 15:20:07 -03:00
|
|
|
|
|
2014-11-09 14:48:36 -04:00
|
|
|
|
# print(code)
|
2000-07-23 18:46:17 -03:00
|
|
|
|
|
2000-07-02 19:25:39 -03:00
|
|
|
|
# map in either direction
|
|
|
|
|
groupindex = p.pattern.groupdict
|
|
|
|
|
indexgroup = [None] * p.pattern.groups
|
|
|
|
|
for k, i in groupindex.items():
|
|
|
|
|
indexgroup[i] = k
|
|
|
|
|
|
2000-06-01 14:39:12 -03:00
|
|
|
|
return _sre.compile(
|
Merged revisions 59666-59679 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59666 | christian.heimes | 2008-01-02 19:28:32 +0100 (Wed, 02 Jan 2008) | 1 line
Made vs9to8 Unix compatible
........
r59669 | guido.van.rossum | 2008-01-02 20:00:46 +0100 (Wed, 02 Jan 2008) | 2 lines
Patch #1696. Don't attempt to close None in dry-run mode.
........
r59671 | jeffrey.yasskin | 2008-01-03 03:21:52 +0100 (Thu, 03 Jan 2008) | 6 lines
Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just
the complex_pow part), r56649, r56652, r56715, r57296, r57302, r57359, r57361,
r57372, r57738, r57739, r58017, r58039, r58040, and r59390, and new
documentation. The only significant difference is that round(x) returns a float
to preserve backward-compatibility. See http://bugs.python.org/issue1689.
........
r59672 | christian.heimes | 2008-01-03 16:41:30 +0100 (Thu, 03 Jan 2008) | 1 line
Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj
........
r59675 | guido.van.rossum | 2008-01-03 20:12:44 +0100 (Thu, 03 Jan 2008) | 4 lines
Issue #1700, reported by Nguyen Quan Son, fix by Fredruk Lundh:
Regular Expression inline flags not handled correctly for some unicode
characters. (Forward port from 2.5.2.)
........
r59676 | christian.heimes | 2008-01-03 21:23:15 +0100 (Thu, 03 Jan 2008) | 1 line
Added math.isinf() and math.isnan()
........
r59677 | christian.heimes | 2008-01-03 22:14:48 +0100 (Thu, 03 Jan 2008) | 1 line
Some build bots don't compile mathmodule. There is an issue with the long definition of pi and euler
........
r59678 | christian.heimes | 2008-01-03 23:16:32 +0100 (Thu, 03 Jan 2008) | 2 lines
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
........
r59679 | christian.heimes | 2008-01-03 23:32:26 +0100 (Thu, 03 Jan 2008) | 1 line
Added copysign(x, y) function to the math module
........
2008-01-03 19:01:04 -04:00
|
|
|
|
pattern, flags | p.pattern.flags, code,
|
2000-07-03 15:44:21 -03:00
|
|
|
|
p.pattern.groups-1,
|
|
|
|
|
groupindex, indexgroup
|
2000-06-30 04:50:59 -03:00
|
|
|
|
)
|